Merge tag 'v1.4.28' into merge-v1.4.28
Change-Id: I623898b2034f132f23d2ac2dfeedb02fee16cd10 Conflicts: fastlane/README.md vector/src/main/AndroidManifest.xml vector/src/main/java/im/vector/app/features/home/HomeActivity.kt vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ReadReceiptsItem.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
This commit is contained in:
commit
dec61e7a35
|
@ -29,7 +29,7 @@ body:
|
||||||
- [ ] Check the rageshake with the current dev version: https://github.com/matrix-org/element-android-rageshakes/labels/1.2.3-dev
|
- [ ] Check the rageshake with the current dev version: https://github.com/matrix-org/element-android-rageshakes/labels/1.2.3-dev
|
||||||
- [ ] Run the integration test, and especially `UiAllScreensSanityTest.allScreensTest()`
|
- [ ] Run the integration test, and especially `UiAllScreensSanityTest.allScreensTest()`
|
||||||
- [ ] Create an account on matrix.org and do some smoke tests that the sanity test does not cover like: 1-1 call, 1-1 video call, Jitsi call for instance
|
- [ ] Create an account on matrix.org and do some smoke tests that the sanity test does not cover like: 1-1 call, 1-1 video call, Jitsi call for instance
|
||||||
- [ ] Run towncrier: `towncrier --version v1.2.3 --draft` (remove `--draft` do write the file CHANGES.md)
|
- [ ] Run towncrier: `towncrier build --version v1.2.3 --draft` (remove `--draft` do write the file CHANGES.md)
|
||||||
- [ ] Check that the folder `changelog.d` is empty. It can happen that some remaining files stay here
|
- [ ] Check that the folder `changelog.d` is empty. It can happen that some remaining files stay here
|
||||||
- [ ] Check the file CHANGES.md consistency. It's possible to reorder items (most important changes first) or change their section if relevant. Also an opportunity to fix some typo, or rewrite things
|
- [ ] Check the file CHANGES.md consistency. It's possible to reorder items (most important changes first) or change their section if relevant. Also an opportunity to fix some typo, or rewrite things
|
||||||
- [ ] Add file for fastlane under ./fastlane/metadata/android/en-US/changelogs
|
- [ ] Add file for fastlane under ./fastlane/metadata/android/en-US/changelogs
|
||||||
|
|
|
@ -21,7 +21,7 @@ jobs:
|
||||||
- name: Run code quality check suite
|
- name: Run code quality check suite
|
||||||
run: ./tools/check/check_code_quality.sh
|
run: ./tools/check/check_code_quality.sh
|
||||||
|
|
||||||
# Knit for all the modules (https://github.com/Kotlin/kotlinx-knit)
|
# Knit for all the modules (https://github.com/Kotlin/kotlinx-knit)
|
||||||
knit:
|
knit:
|
||||||
name: Knit
|
name: Knit
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
@ -31,7 +31,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
./gradlew knit
|
./gradlew knit
|
||||||
|
|
||||||
# ktlint for all the modules
|
# ktlint for all the modules
|
||||||
ktlint:
|
ktlint:
|
||||||
name: Kotlin Linter
|
name: Kotlin Linter
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
@ -104,7 +104,7 @@ jobs:
|
||||||
comment_id: ${{ steps.fc.outputs.comment-id }}
|
comment_id: ${{ steps.fc.outputs.comment-id }}
|
||||||
})
|
})
|
||||||
|
|
||||||
# Gradle dependency analysis using https://github.com/autonomousapps/dependency-analysis-android-gradle-plugin
|
# Gradle dependency analysis using https://github.com/autonomousapps/dependency-analysis-android-gradle-plugin
|
||||||
dependency-analysis:
|
dependency-analysis:
|
||||||
name: Dependency analysis
|
name: Dependency analysis
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
@ -123,7 +123,7 @@ jobs:
|
||||||
name: dependency-analysis
|
name: dependency-analysis
|
||||||
path: build/reports/dependency-check-report.html
|
path: build/reports/dependency-check-report.html
|
||||||
|
|
||||||
# Lint for main module
|
# Lint for main module
|
||||||
android-lint:
|
android-lint:
|
||||||
name: Android Linter
|
name: Android Linter
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
@ -151,7 +151,7 @@ jobs:
|
||||||
path: |
|
path: |
|
||||||
vector/build/reports/*.*
|
vector/build/reports/*.*
|
||||||
|
|
||||||
# Lint for Gplay and Fdroid release APK
|
# Lint for Gplay and Fdroid release APK
|
||||||
apk-lint:
|
apk-lint:
|
||||||
name: Lint APK (${{ matrix.target }})
|
name: Lint APK (${{ matrix.target }})
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
@ -203,3 +203,26 @@ jobs:
|
||||||
name: detekt-report
|
name: detekt-report
|
||||||
path: |
|
path: |
|
||||||
*/build/reports/detekt/detekt.html
|
*/build/reports/detekt/detekt.html
|
||||||
|
|
||||||
|
# towncrier:
|
||||||
|
# name: Towncrier check
|
||||||
|
# runs-on: ubuntu-latest
|
||||||
|
# if: github.event_name == 'pull_request' && github.head_ref == 'develop'
|
||||||
|
# steps:
|
||||||
|
# - uses: actions/checkout@v3
|
||||||
|
# - name: Set up Python 3.8
|
||||||
|
# uses: actions/setup-python@v4
|
||||||
|
# with:
|
||||||
|
# python-version: 3.8
|
||||||
|
# - name: Install towncrier
|
||||||
|
# run: |
|
||||||
|
# python3 -m pip install towncrier
|
||||||
|
# - name: Run towncrier
|
||||||
|
# # Fetch the pull request' base branch so towncrier will be able to
|
||||||
|
# # compare the current branch with the base branch.
|
||||||
|
# # Source: https://github.com/actions/checkout/#fetch-all-branches.
|
||||||
|
# run: |
|
||||||
|
# git fetch --no-tags origin +refs/heads/${BASE_BRANCH}:refs/remotes/origin/${BASE_BRANCH}
|
||||||
|
# towncrier check --compare-with origin/${BASE_BRANCH}
|
||||||
|
# env:
|
||||||
|
# BASE_BRANCH: ${{ github.base_ref }}
|
||||||
|
|
39
CHANGES.md
39
CHANGES.md
|
@ -1,3 +1,42 @@
|
||||||
|
Changes in Element v1.4.28 (2022-07-13)
|
||||||
|
=======================================
|
||||||
|
|
||||||
|
Features ✨
|
||||||
|
----------
|
||||||
|
- Improve user experience when he is first invited to a room. Users will be able to decrypt and view previous messages ([#5853](https://github.com/vector-im/element-android/issues/5853))
|
||||||
|
- [Location sharing] - Reply action on a live message ([#6401](https://github.com/vector-im/element-android/issues/6401))
|
||||||
|
- Show a loader if all the Room Members are not yet loaded. ([#6413](https://github.com/vector-im/element-android/issues/6413))
|
||||||
|
|
||||||
|
Bugfixes 🐛
|
||||||
|
----------
|
||||||
|
- Fixes numbered lists always starting from 1 ([#4777](https://github.com/vector-im/element-android/issues/4777))
|
||||||
|
- Adds LoginType to SessionParams to fix soft logout form not showing for SSO and Password type ([#5398](https://github.com/vector-im/element-android/issues/5398))
|
||||||
|
- Use stable endpoint for alias management instead of MSC2432. Contributed by Nico. ([#6288](https://github.com/vector-im/element-android/issues/6288))
|
||||||
|
- [Poll] Fixes visible and wrong votes in closed poll after removing 2 previous polls ([#6430](https://github.com/vector-im/element-android/issues/6430))
|
||||||
|
- Fix HTML entities being displayed in messages ([#6442](https://github.com/vector-im/element-android/issues/6442))
|
||||||
|
- Gallery picker can pick external images ([#6450](https://github.com/vector-im/element-android/issues/6450))
|
||||||
|
- Fixes crash when sharing plain text, such as a url ([#6451](https://github.com/vector-im/element-android/issues/6451))
|
||||||
|
- Fix crashes on Timeline [Thread] due to range validation ([#6461](https://github.com/vector-im/element-android/issues/6461))
|
||||||
|
- Fix crashes when opening Thread ([#6463](https://github.com/vector-im/element-android/issues/6463))
|
||||||
|
- Fix ConcurrentModificationException on BackgroundDetectionObserver ([#6469](https://github.com/vector-im/element-android/issues/6469))
|
||||||
|
- Fixes inconsistency with rooms within spaces showing or disappearing from home ([#6510](https://github.com/vector-im/element-android/issues/6510))
|
||||||
|
|
||||||
|
In development 🚧
|
||||||
|
----------------
|
||||||
|
- FTUE - Adds support for resetting the password during the FTUE onboarding journey ([#5284](https://github.com/vector-im/element-android/issues/5284))
|
||||||
|
- Create DM room only on first message - Design implementation & debug feature flag ([#5525](https://github.com/vector-im/element-android/issues/5525))
|
||||||
|
|
||||||
|
Other changes
|
||||||
|
-------------
|
||||||
|
- Replacing Epoxy annotation layout id references with getDefaultLayoutId ([#6389](https://github.com/vector-im/element-android/issues/6389))
|
||||||
|
- Ensure `RealmList<T>.clearWith()` extension is correctly used. ([#6392](https://github.com/vector-im/element-android/issues/6392))
|
||||||
|
- [Poll] - Add a description under undisclosed poll when not ended ([#6423](https://github.com/vector-im/element-android/issues/6423))
|
||||||
|
- Add `android:hasFragileUserData="true"` in the manifest ([#6429](https://github.com/vector-im/element-android/issues/6429))
|
||||||
|
- Add code check to prevent modification of frozen class ([#6434](https://github.com/vector-im/element-android/issues/6434))
|
||||||
|
- Let your Activity or Fragment implement `VectorMenuProvider` if they provide a menu. ([#6436](https://github.com/vector-im/element-android/issues/6436))
|
||||||
|
- Rename Android Service to use `AndroidService` suffix ([#6458](https://github.com/vector-im/element-android/issues/6458))
|
||||||
|
|
||||||
|
|
||||||
Changes in Element v1.4.27 (2022-07-06)
|
Changes in Element v1.4.27 (2022-07-06)
|
||||||
=======================================
|
=======================================
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ buildscript {
|
||||||
classpath libs.gradle.gradlePlugin
|
classpath libs.gradle.gradlePlugin
|
||||||
classpath libs.gradle.kotlinPlugin
|
classpath libs.gradle.kotlinPlugin
|
||||||
classpath libs.gradle.hiltPlugin
|
classpath libs.gradle.hiltPlugin
|
||||||
classpath 'com.google.gms:google-services:4.3.10'
|
classpath 'com.google.gms:google-services:4.3.13'
|
||||||
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.4.0.2513'
|
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.4.0.2513'
|
||||||
classpath 'com.google.android.gms:oss-licenses-plugin:0.10.5'
|
classpath 'com.google.android.gms:oss-licenses-plugin:0.10.5'
|
||||||
classpath "com.likethesalad.android:stem-plugin:2.1.1"
|
classpath "com.likethesalad.android:stem-plugin:2.1.1"
|
||||||
|
|
|
@ -7,6 +7,7 @@ def excludes = [
|
||||||
'**/*Activity*',
|
'**/*Activity*',
|
||||||
'**/*Fragment*',
|
'**/*Fragment*',
|
||||||
'**/*Application*',
|
'**/*Application*',
|
||||||
|
'**/*AndroidService*',
|
||||||
|
|
||||||
// We would like to exclude android widgets as well but our naming is inconsistent
|
// We would like to exclude android widgets as well but our naming is inconsistent
|
||||||
|
|
||||||
|
|
|
@ -19,9 +19,9 @@ def retrofit = "2.9.0"
|
||||||
def arrow = "0.8.2"
|
def arrow = "0.8.2"
|
||||||
def markwon = "4.6.2"
|
def markwon = "4.6.2"
|
||||||
def moshi = "1.13.0"
|
def moshi = "1.13.0"
|
||||||
def lifecycle = "2.4.1"
|
def lifecycle = "2.5.0"
|
||||||
def flowBinding = "1.2.0"
|
def flowBinding = "1.2.0"
|
||||||
def flipper = "0.151.1"
|
def flipper = "0.153.0"
|
||||||
def epoxy = "4.6.2"
|
def epoxy = "4.6.2"
|
||||||
def mavericks = "2.7.0"
|
def mavericks = "2.7.0"
|
||||||
def glide = "4.13.2"
|
def glide = "4.13.2"
|
||||||
|
@ -29,7 +29,7 @@ def bigImageViewer = "1.8.1"
|
||||||
def jjwt = "0.11.5"
|
def jjwt = "0.11.5"
|
||||||
def vanniktechEmoji = "0.15.0"
|
def vanniktechEmoji = "0.15.0"
|
||||||
|
|
||||||
def fragment = "1.4.1"
|
def fragment = "1.5.0"
|
||||||
|
|
||||||
// Testing
|
// Testing
|
||||||
def mockk = "1.12.3" // We need to use 1.12.3 to have mocking in androidTest until a new version is released: https://github.com/mockk/mockk/issues/819
|
def mockk = "1.12.3" // We need to use 1.12.3 to have mocking in androidTest until a new version is released: https://github.com/mockk/mockk/issues/819
|
||||||
|
@ -51,7 +51,7 @@ ext.libs = [
|
||||||
],
|
],
|
||||||
androidx : [
|
androidx : [
|
||||||
'annotation' : "androidx.annotation:annotation:1.4.0",
|
'annotation' : "androidx.annotation:annotation:1.4.0",
|
||||||
'activity' : "androidx.activity:activity:1.4.0",
|
'activity' : "androidx.activity:activity:1.5.0",
|
||||||
'annotations' : "androidx.annotation:annotation:1.3.0",
|
'annotations' : "androidx.annotation:annotation:1.3.0",
|
||||||
'appCompat' : "androidx.appcompat:appcompat:1.4.2",
|
'appCompat' : "androidx.appcompat:appcompat:1.4.2",
|
||||||
'biometric' : "androidx.biometric:biometric:1.1.0",
|
'biometric' : "androidx.biometric:biometric:1.1.0",
|
||||||
|
@ -97,6 +97,9 @@ ext.libs = [
|
||||||
'flipper' : "com.facebook.flipper:flipper:$flipper",
|
'flipper' : "com.facebook.flipper:flipper:$flipper",
|
||||||
'flipperNetworkPlugin' : "com.facebook.flipper:flipper-network-plugin:$flipper",
|
'flipperNetworkPlugin' : "com.facebook.flipper:flipper-network-plugin:$flipper",
|
||||||
],
|
],
|
||||||
|
element : [
|
||||||
|
'opusencoder' : "io.element.android:opusencoder:1.0.3",
|
||||||
|
],
|
||||||
squareup : [
|
squareup : [
|
||||||
'moshi' : "com.squareup.moshi:moshi:$moshi",
|
'moshi' : "com.squareup.moshi:moshi:$moshi",
|
||||||
'moshiKt' : "com.squareup.moshi:moshi-kotlin:$moshi",
|
'moshiKt' : "com.squareup.moshi:moshi-kotlin:$moshi",
|
||||||
|
|
|
@ -125,6 +125,7 @@ ext.groups = [
|
||||||
'commons-logging',
|
'commons-logging',
|
||||||
'info.picocli',
|
'info.picocli',
|
||||||
'io.arrow-kt',
|
'io.arrow-kt',
|
||||||
|
'io.element.android',
|
||||||
'io.github.detekt.sarif4k',
|
'io.github.detekt.sarif4k',
|
||||||
'io.github.microutils',
|
'io.github.microutils',
|
||||||
'io.github.reactivecircus.flowbinding',
|
'io.github.reactivecircus.flowbinding',
|
||||||
|
|
|
@ -191,7 +191,7 @@ Examples of prefixes:
|
||||||
- `[Bugfix]`
|
- `[Bugfix]`
|
||||||
- etc.
|
- etc.
|
||||||
|
|
||||||
Also, it's still possible to add labels to the PRs, such as `A-` or `T-` labels, even if this is not a string requirement. We prefer to spend time to add labels on issues.
|
Also, it's still possible to add labels to the PRs, such as `A-` or `T-` labels, even if this is not a strong requirement. We prefer to spend time to add labels on issues.
|
||||||
|
|
||||||
##### PR description
|
##### PR description
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,64 @@
|
||||||
|
fastlane documentation
|
||||||
|
----
|
||||||
|
|
||||||
|
# Installation
|
||||||
|
|
||||||
|
Make sure you have the latest version of the Xcode command line tools installed:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
xcode-select --install
|
||||||
|
```
|
||||||
|
|
||||||
|
For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane)
|
||||||
|
|
||||||
|
# Available Actions
|
||||||
|
|
||||||
|
## Android
|
||||||
|
|
||||||
|
### android test
|
||||||
|
|
||||||
|
```sh
|
||||||
|
[bundle exec] fastlane android test
|
||||||
|
```
|
||||||
|
|
||||||
|
Runs all the tests
|
||||||
|
|
||||||
|
### android beta
|
||||||
|
|
||||||
|
```sh
|
||||||
|
[bundle exec] fastlane android beta
|
||||||
|
```
|
||||||
|
|
||||||
|
Submit a new Beta Build to Crashlytics Beta
|
||||||
|
|
||||||
|
### android deploy
|
||||||
|
|
||||||
|
```sh
|
||||||
|
[bundle exec] fastlane android deploy
|
||||||
|
```
|
||||||
|
|
||||||
|
Deploy a new version to the Google Play
|
||||||
|
|
||||||
|
### android deployMeta
|
||||||
|
|
||||||
|
```sh
|
||||||
|
[bundle exec] fastlane android deployMeta
|
||||||
|
```
|
||||||
|
|
||||||
|
Deploy Google Play metadata
|
||||||
|
|
||||||
|
### android getVersionCode
|
||||||
|
|
||||||
|
```sh
|
||||||
|
[bundle exec] fastlane android getVersionCode
|
||||||
|
```
|
||||||
|
|
||||||
|
Get version code
|
||||||
|
|
||||||
|
----
|
||||||
|
|
||||||
|
This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
|
||||||
|
|
||||||
|
More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools).
|
||||||
|
|
||||||
|
The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools).
|
|
@ -0,0 +1,2 @@
|
||||||
|
Hlavní změny v této verzi: Opravy různých chyb a vylepšení stability.
|
||||||
|
Úplný seznam změn: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Hlavní změny v této verzi: Opravy různých chyb a vylepšení stability.
|
||||||
|
Úplný seznam změn: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Hlavní změny v této verzi: Opravy různých chyb a vylepšení stability.
|
||||||
|
Úplný seznam změn: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Hlavní změny v této verzi: Opravy různých chyb a vylepšení stability.
|
||||||
|
Úplný seznam změn: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Die wichtigsten Änderungen in dieser Version: Verbesserte Verwaltung der ignorierten Benutzer:innen. Verschiedene Fehlerbehebungen und Stabilitätsverbesserungen.
|
||||||
|
Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Die wichtigsten Änderungen in dieser Version: Bessere Verwaltung von verschlüsselten Nachrichten. Verschiedene Fehlerbehebungen und Stabilitätsverbesserungen.
|
||||||
|
Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Die wichtigsten Änderungen in dieser Version: Verschiedene Fehlerbehebungen und Stabilitätsverbesserungen.
|
||||||
|
Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Die wichtigsten Änderungen in dieser Version: Verschiedene Fehlerbehebungen und Stabilitätsverbesserungen.
|
||||||
|
Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Die wichtigsten Änderungen in dieser Version: Verschiedene Fehlerbehebungen und Stabilitätsverbesserungen.
|
||||||
|
Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Die wichtigsten Änderungen in dieser Version: Verschiedene Fehlerbehebungen und Stabilitätsverbesserungen.
|
||||||
|
Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Die wichtigsten Änderungen in dieser Version: Verschiedene Fehlerbehebungen und Stabilitätsverbesserungen.
|
||||||
|
Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Die wichtigsten Änderungen in dieser Version: Verschiedene Fehlerbehebungen und Stabilitätsverbesserungen.
|
||||||
|
Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Die wichtigsten Änderungen in dieser Version: Verschiedene Fehlerbehebungen und Stabilitätsverbesserungen.
|
||||||
|
Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Main changes in this version: Various bug fixes and stability improvements.
|
||||||
|
Full changelog: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Põhilised muutused selles versioonis: erinevate vigade parandused ja stabiilsust edendavad kohendused.
|
||||||
|
Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Põhilised muutused selles versioonis: erinevate vigade parandused ja stabiilsust edendavad kohendused.
|
||||||
|
Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Põhilised muutused selles versioonis: erinevate vigade parandused ja stabiilsust edendavad kohendused.
|
||||||
|
Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Põhilised muutused selles versioonis: erinevate vigade parandused ja stabiilsust edendavad kohendused.
|
||||||
|
Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
تغییرات عمده در این نگارش: رفع اشکالهای مختلف و بهبودهای پایداری.
|
||||||
|
گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
تغییرات عمده در این نگارش: رفع اشکالهای مختلف و بهبودهای پایداری.
|
||||||
|
گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
تغییرات عمده در این نگارش: رفع اشکالهای مختلف و بهبودهای پایداری.
|
||||||
|
گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
تغییرات عمده در این نگارش: رفع اشکالهای مختلف و بهبودهای پایداری.
|
||||||
|
گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Principaux changements pour cette version : Plusieurs corrections de bogues et d’améliorations de stabilité.
|
||||||
|
Intégralité des changements : https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Principaux changements pour cette version : Plusieurs corrections de bogues et d’améliorations de stabilité.
|
||||||
|
Intégralité des changements : https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Principaux changements pour cette version : Plusieurs corrections de bogues et d’améliorations de stabilité.
|
||||||
|
Intégralité des changements : https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Principaux changements pour cette version : Plusieurs corrections de bogues et d’améliorations de stabilité.
|
||||||
|
Intégralité des changements : https://github.com/vector-im/element-android/releases
|
|
@ -1 +1 @@
|
||||||
Element - Biztonságos üzenetküldő
|
Element
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
Perubahan utama dalam versi ini: Banyak perbaikan kutu dan perbaikan stabilitas.
|
||||||
|
Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Perubahan utama dalam versi ini: Banyak perbaikan kutu dan perbaikan stabilitas.
|
||||||
|
Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Perubahan utama dalam versi ini: Banyak perbaikan kutu dan perbaikan stabilitas.
|
||||||
|
Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Perubahan utama dalam versi ini: Banyak perbaikan kutu dan perbaikan stabilitas.
|
||||||
|
Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Modifiche principali in questa versione: varie correzioni di errori e miglioramenti della stabilità.
|
||||||
|
Cronologia completa: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Modifiche principali in questa versione: varie correzioni di errori e miglioramenti della stabilità.
|
||||||
|
Cronologia completa: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Modifiche principali in questa versione: varie correzioni di errori e miglioramenti della stabilità.
|
||||||
|
Cronologia completa: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Modifiche principali in questa versione: varie correzioni di errori e miglioramenti della stabilità.
|
||||||
|
Cronologia completa: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Principais mudanças nesta versão: Várias correções de bugs e melhorias de estabilidade.
|
||||||
|
Registro de mudanças completo: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Principais mudanças nesta versão: Várias correções de bugs e melhorias de estabilidade.
|
||||||
|
Registro de mudanças completo: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Principais mudanças nesta versão: Várias correções de bugs e melhorias de estabilidade.
|
||||||
|
Registro de mudanças completo: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Principais mudanças nesta versão: Várias correções de bugs e melhorias de estabilidade.
|
||||||
|
Registro de mudanças completo: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Основные изменения в этой версии: обновлён индикатор набора сообщения. Исправлены известные ошибки и улучшена стабильность.
|
||||||
|
Полный список изменений: https://github.com/vector-im/element-android/releases/tag/v1.4.4
|
|
@ -0,0 +1,2 @@
|
||||||
|
Основные изменения в этой версии: Лента веток работает в реальном времени и быстрее. Различные исправления ошибок и улучшения стабильности.
|
||||||
|
Полный список изменений: https://github.com/vector-im/element-android/releases/tag/v1.4.6
|
|
@ -0,0 +1,2 @@
|
||||||
|
Основные изменения в этой версии: Различные исправления ошибок и улучшения стабильности.
|
||||||
|
Полный список изменений: https://github.com/vector-im/element-android/releases/tag/v1.4.7
|
|
@ -0,0 +1,2 @@
|
||||||
|
Основные изменения в этой версии: Лента веток работает в реальном времени и быстрее. Различные исправления ошибок и улучшения стабильности.
|
||||||
|
Полный список изменений: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Основные изменения в этой версии: Прокрутка голосовых сообщений. Различные исправления ошибок и улучшения стабильности.
|
||||||
|
Полный список изменений: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Основные изменения в этой версии: Различные исправления ошибок и улучшения стабильности.
|
||||||
|
Полный список изменений: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Основные изменения в этой версии: Позволяет пользователям появляться в автономном режиме и добавляет аудиопроигрыватель для аудиовложений
|
||||||
|
Полный список изменений: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Основные изменения в этой версии: Позволяет пользователям появляться в автономном режиме и добавляет аудиопроигрыватель для аудиовложений.
|
||||||
|
Полный список изменений: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Основные изменения в этой версии: Улучшено управление игнорируемыми пользователями. Различные исправления ошибок и улучшения стабильности.
|
||||||
|
Полный список изменений: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Основные изменения в этой версии: Улучшено управление зашифрованными сообщениями. Различные исправления ошибок и улучшения стабильности.
|
||||||
|
Полный список изменений: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Основные изменения в этой версии: Различные исправления ошибок и улучшения стабильности.
|
||||||
|
Полный список изменений: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Основные изменения в этой версии: Различные исправления ошибок и улучшения стабильности.
|
||||||
|
Полный список изменений: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Основные изменения в этой версии: Различные исправления ошибок и улучшения стабильности.
|
||||||
|
Полный список изменений: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Основные изменения в этой версии: Различные исправления ошибок и улучшения стабильности.
|
||||||
|
Полный список изменений: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Основные изменения в этой версии: Различные исправления ошибок и улучшения стабильности.
|
||||||
|
Полный список изменений: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Основные изменения в этой версии: Различные исправления ошибок и улучшения стабильности.
|
||||||
|
Полный список изменений: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Основные изменения в этой версии: исправлены известные проблемы и улучшена стабильность.
|
||||||
|
Полный список изменений: https://github.com/vector-im/element-android/releases
|
|
@ -40,4 +40,4 @@ Element дает вам возможность контролировать си
|
||||||
|
|
||||||
|
|
||||||
<b>Открытый исходный код</b>
|
<b>Открытый исходный код</b>
|
||||||
Element Android - это проект с открытым исходным кодом, размещенный на GitHub. Пожалуйста, сообщайте об ошибках и/или вносите вклад в его развитие по адресу https://github.com/vector-im/element-android.
|
Element Android - это проект с открытым исходным кодом, размещенный на GitHub. Пожалуйста, сообщайте об ошибках и/или вносите вклад в его развитие по адресу https://github.com/vector-im/element-android
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
Hlavné zmeny v tejto verzii: Rôzne opravy chýb a vylepšenia stability.
|
||||||
|
Úplný zoznam zmien: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Hlavné zmeny v tejto verzii: Rôzne opravy chýb a vylepšenia stability.
|
||||||
|
Úplný zoznam zmien: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Hlavné zmeny v tejto verzii: Rôzne opravy chýb a vylepšenia stability.
|
||||||
|
Úplný zoznam zmien: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Hlavné zmeny v tejto verzii: Rôzne opravy chýb a vylepšenia stability.
|
||||||
|
Úplný zoznam zmien: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Huvudsakliga ändringar i den här versionen: Diverse buggfixar och stabilitetsförbättringar.
|
||||||
|
Full ändringslogg: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Huvudsakliga ändringar i den här versionen: Diverse buggfixar och stabilitetsförbättringar.
|
||||||
|
Full ändringslogg: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Huvudsakliga ändringar i den här versionen: Diverse buggfixar och stabilitetsförbättringar.
|
||||||
|
Full ändringslogg: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Huvudsakliga ändringar i den här versionen: Diverse buggfixar och stabilitetsförbättringar.
|
||||||
|
Full ändringslogg: https://github.com/vector-im/element-android/releases
|
|
@ -1 +1 @@
|
||||||
Element - பாதுகாப்பான தூதுரை சேவை
|
Element
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
Основні зміни в цій версії: Усунуто різні вади й поліпшено стабільність.
|
||||||
|
Вичерпний перелік змін: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Основні зміни в цій версії: Усунуто різні вади й поліпшено стабільність.
|
||||||
|
Вичерпний перелік змін: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Основні зміни в цій версії: Усунуто різні вади й поліпшено стабільність.
|
||||||
|
Вичерпний перелік змін: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
Основні зміни в цій версії: Усунуто різні вади й поліпшено стабільність.
|
||||||
|
Вичерпний перелік змін: https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
此版本中的主要變動:多個臭蟲修復與穩定性改善。
|
||||||
|
完整的變更紀錄:https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
此版本中的主要變動:多個臭蟲修復與穩定性改善。
|
||||||
|
完整的變更紀錄:https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
此版本中的主要變動:多個臭蟲修復與穩定性改善。
|
||||||
|
完整的變更紀錄:https://github.com/vector-im/element-android/releases
|
|
@ -0,0 +1,2 @@
|
||||||
|
此版本中的主要變動:多個臭蟲修復與穩定性改善。
|
||||||
|
完整的變更紀錄:https://github.com/vector-im/element-android/releases
|
|
@ -2,7 +2,6 @@ apply plugin: 'com.android.library'
|
||||||
apply plugin: 'kotlin-android'
|
apply plugin: 'kotlin-android'
|
||||||
apply plugin: 'kotlin-parcelize'
|
apply plugin: 'kotlin-parcelize'
|
||||||
apply plugin: 'kotlin-kapt'
|
apply plugin: 'kotlin-kapt'
|
||||||
apply plugin: 'com.jakewharton.butterknife'
|
|
||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
repositories {
|
repositories {
|
||||||
|
@ -15,9 +14,6 @@ buildscript {
|
||||||
url 'https://repo1.maven.org/maven2'
|
url 'https://repo1.maven.org/maven2'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
dependencies {
|
|
||||||
classpath 'com.jakewharton:butterknife-gradle-plugin:10.2.3'
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
|
|
@ -29,7 +29,7 @@ import com.airbnb.epoxy.EpoxyModelClass
|
||||||
import com.airbnb.epoxy.EpoxyModelWithHolder
|
import com.airbnb.epoxy.EpoxyModelWithHolder
|
||||||
import im.vector.lib.core.utils.epoxy.charsequence.EpoxyCharSequence
|
import im.vector.lib.core.utils.epoxy.charsequence.EpoxyCharSequence
|
||||||
|
|
||||||
@EpoxyModelClass(layout = R2.layout.item_jv_base_value)
|
@EpoxyModelClass
|
||||||
internal abstract class ValueItem : EpoxyModelWithHolder<ValueItem.Holder>() {
|
internal abstract class ValueItem : EpoxyModelWithHolder<ValueItem.Holder>() {
|
||||||
|
|
||||||
@EpoxyAttribute
|
@EpoxyAttribute
|
||||||
|
@ -44,6 +44,8 @@ internal abstract class ValueItem : EpoxyModelWithHolder<ValueItem.Holder>() {
|
||||||
@EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
|
@EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
|
||||||
var itemClickListener: View.OnClickListener? = null
|
var itemClickListener: View.OnClickListener? = null
|
||||||
|
|
||||||
|
override fun getDefaultLayout() = R.layout.item_jv_base_value
|
||||||
|
|
||||||
override fun bind(holder: Holder) {
|
override fun bind(holder: Holder) {
|
||||||
super.bind(holder)
|
super.bind(holder)
|
||||||
holder.textView.text = text?.charSequence
|
holder.textView.text = text?.charSequence
|
||||||
|
|
|
@ -49,7 +49,7 @@ class MediaPicker : Picker<MultiPickerBaseMediaType>() {
|
||||||
return Intent(Intent.ACTION_GET_CONTENT).apply {
|
return Intent(Intent.ACTION_GET_CONTENT).apply {
|
||||||
addCategory(Intent.CATEGORY_OPENABLE)
|
addCategory(Intent.CATEGORY_OPENABLE)
|
||||||
putExtra(Intent.EXTRA_ALLOW_MULTIPLE, !single)
|
putExtra(Intent.EXTRA_ALLOW_MULTIPLE, !single)
|
||||||
type = "video/*, image/*"
|
type = "*/*"
|
||||||
val mimeTypes = arrayOf("image/*", "video/*")
|
val mimeTypes = arrayOf("image/*", "video/*")
|
||||||
putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes)
|
putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes)
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,10 +0,0 @@
|
||||||
*.iml
|
|
||||||
.gradle
|
|
||||||
/local.properties
|
|
||||||
/.idea
|
|
||||||
.DS_Store
|
|
||||||
/build
|
|
||||||
/captures
|
|
||||||
*.cxx
|
|
||||||
app/.cxx/*
|
|
||||||
.externalNativeBuild
|
|
|
@ -1,40 +0,0 @@
|
||||||
apply plugin: 'com.android.library'
|
|
||||||
apply plugin: 'kotlin-android'
|
|
||||||
|
|
||||||
android {
|
|
||||||
ndkVersion "21.3.6528147"
|
|
||||||
|
|
||||||
compileSdkVersion 31
|
|
||||||
|
|
||||||
buildToolsVersion "31.0.0"
|
|
||||||
|
|
||||||
defaultConfig {
|
|
||||||
minSdkVersion 18
|
|
||||||
targetSdkVersion 31
|
|
||||||
versionCode 1
|
|
||||||
versionName "1.0"
|
|
||||||
|
|
||||||
externalNativeBuild {
|
|
||||||
ndk {
|
|
||||||
abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
buildTypes {
|
|
||||||
release {
|
|
||||||
minifyEnabled false
|
|
||||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
externalNativeBuild {
|
|
||||||
cmake {
|
|
||||||
path "src/main/cpp/CMakeLists.txt"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
implementation libs.androidx.annotation
|
|
||||||
}
|
|
|
@ -1,2 +0,0 @@
|
||||||
<?xml version="1.0"?>
|
|
||||||
<manifest package="im.vector.opusencoder" xmlns:android="http://schemas.android.com/apk/res/android"/>
|
|
|
@ -1,61 +0,0 @@
|
||||||
# For more information about using CMake with Android Studio, read the
|
|
||||||
# documentation: https://d.android.com/studio/projects/add-native-code.html
|
|
||||||
|
|
||||||
# Sets the minimum version of CMake required to build the native library.
|
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.4.1)
|
|
||||||
set(CMAKE_CXX_STANDARD 14)
|
|
||||||
|
|
||||||
# Creates and names a library, sets it as either STATIC
|
|
||||||
# or SHARED, and provides the relative paths to its source code.
|
|
||||||
# You can define multiple libraries, and CMake builds them for you.
|
|
||||||
# Gradle automatically packages shared libraries with your APK.
|
|
||||||
|
|
||||||
set(distribution_OPUS_DIR ${CMAKE_SOURCE_DIR}/opus)
|
|
||||||
|
|
||||||
add_library(lib_opus SHARED IMPORTED)
|
|
||||||
set_target_properties(lib_opus PROPERTIES IMPORTED_LOCATION
|
|
||||||
${distribution_OPUS_DIR}/libs/${ANDROID_ABI}/libopus.so)
|
|
||||||
|
|
||||||
add_library(lib_opusenc SHARED IMPORTED)
|
|
||||||
set_target_properties(lib_opusenc PROPERTIES IMPORTED_LOCATION
|
|
||||||
${distribution_OPUS_DIR}/libs/${ANDROID_ABI}/libopusenc.so)
|
|
||||||
|
|
||||||
add_library( # Sets the name of the library.
|
|
||||||
opuscodec
|
|
||||||
|
|
||||||
# Sets the library as a shared library.
|
|
||||||
SHARED
|
|
||||||
|
|
||||||
# Provides a relative path to your source file(s).
|
|
||||||
codec/CodecOggOpus.cpp
|
|
||||||
opuscodec.cpp)
|
|
||||||
|
|
||||||
target_include_directories(opuscodec PRIVATE
|
|
||||||
${distribution_OPUS_DIR}/include)
|
|
||||||
|
|
||||||
# Searches for a specified prebuilt library and stores the path as a
|
|
||||||
# variable. Because CMake includes system libraries in the search path by
|
|
||||||
# default, you only need to specify the name of the public NDK library
|
|
||||||
# you want to add. CMake verifies that the library exists before
|
|
||||||
# completing its build.
|
|
||||||
|
|
||||||
find_library( # Sets the name of the path variable.
|
|
||||||
log-lib
|
|
||||||
|
|
||||||
# Specifies the name of the NDK library that
|
|
||||||
# you want CMake to locate.
|
|
||||||
log )
|
|
||||||
|
|
||||||
# Specifies libraries CMake should link to your target library. You
|
|
||||||
# can link multiple libraries, such as libraries you define in this
|
|
||||||
# build script, prebuilt third-party libraries, or system libraries.
|
|
||||||
|
|
||||||
target_link_libraries( # Specifies the target library.
|
|
||||||
opuscodec
|
|
||||||
android
|
|
||||||
lib_opusenc
|
|
||||||
lib_opus
|
|
||||||
# Links the target library to the log library
|
|
||||||
# included in the NDK.
|
|
||||||
${log-lib} )
|
|
|
@ -1,63 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2022 New Vector Ltd
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "CodecOggOpus.h"
|
|
||||||
#include "../utils/Logger.h"
|
|
||||||
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
int CodecOggOpus::encoderInit(char* filePath, int sampleRate) {
|
|
||||||
// Create default, empty comment header
|
|
||||||
comments = ope_comments_create();
|
|
||||||
// Mono audio
|
|
||||||
int numChannels = 1;
|
|
||||||
// Channel Mapping Family 0, used for mono/stereo streams
|
|
||||||
int family = 0;
|
|
||||||
// Create encoder to encode PCM chunks and write the result to a file with the OggOpus framing
|
|
||||||
encoder = ope_encoder_create_file(filePath, comments, sampleRate, numChannels, family, &ret);
|
|
||||||
if (ret != OPE_OK) {
|
|
||||||
LOGE(TAG, "Creation of OggOpusEnc failed.");
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
return OPE_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
int CodecOggOpus::setBitrate(int bitrate) {
|
|
||||||
ret = ope_encoder_ctl(encoder, OPUS_SET_BITRATE_REQUEST, bitrate);
|
|
||||||
if (ret != OPE_OK) {
|
|
||||||
LOGE(TAG, "Could not set bitrate.");
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
return OPE_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
int CodecOggOpus::writeFrame(short* frame, int samplesPerChannel) {
|
|
||||||
// Encode the raw PCM-16 buffer to Opus and write it to the ogg file
|
|
||||||
return ope_encoder_write(encoder, frame, samplesPerChannel);
|
|
||||||
}
|
|
||||||
|
|
||||||
void CodecOggOpus::encoderRelease() {
|
|
||||||
// Finish any pending encode/write operations
|
|
||||||
ope_encoder_drain(encoder);
|
|
||||||
// De-init the encoder instance
|
|
||||||
ope_encoder_destroy(encoder);
|
|
||||||
// De-init the comment header struct
|
|
||||||
ope_comments_destroy(comments);
|
|
||||||
}
|
|
||||||
|
|
||||||
CodecOggOpus::~CodecOggOpus() {
|
|
||||||
encoderRelease();
|
|
||||||
}
|
|
|
@ -1,52 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2022 New Vector Ltd
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef ELEMENT_ANDROID_CODECOGGOPUS_H
|
|
||||||
#define ELEMENT_ANDROID_CODECOGGOPUS_H
|
|
||||||
|
|
||||||
#include <opusenc.h>
|
|
||||||
/**
|
|
||||||
* This class is a wrapper around libopusenc, used to encode and write Opus frames into an Ogg file.
|
|
||||||
*
|
|
||||||
* The usual flow would be:
|
|
||||||
*
|
|
||||||
* 1. Use encoderInit to initialize the internal encoder with the sample rate and the path to write the encoded frames to.
|
|
||||||
* 2. (Optional) set the bitrate to use.
|
|
||||||
* 3. While recording, read PCM-16 chunks from the recorder, feed them to the encoder using writeFrame.
|
|
||||||
* 4. When finished, call encoderRelease to free some resources.
|
|
||||||
*/
|
|
||||||
class CodecOggOpus {
|
|
||||||
|
|
||||||
private:
|
|
||||||
const char *TAG = "CodecOggOpus";
|
|
||||||
|
|
||||||
OggOpusEnc* encoder;
|
|
||||||
OggOpusComments* comments;
|
|
||||||
|
|
||||||
public:
|
|
||||||
int encoderInit(char* filePath, int sampleRate);
|
|
||||||
|
|
||||||
int setBitrate(int bitrate);
|
|
||||||
|
|
||||||
int writeFrame(short *frame, int samplesPerChannel);
|
|
||||||
|
|
||||||
void encoderRelease();
|
|
||||||
|
|
||||||
~CodecOggOpus();
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
#endif //ELEMENT_ANDROID_CODECOGGOPUS_H
|
|
|
@ -1,981 +0,0 @@
|
||||||
/* Copyright (c) 2010-2011 Xiph.Org Foundation, Skype Limited
|
|
||||||
Written by Jean-Marc Valin and Koen Vos */
|
|
||||||
/*
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
|
||||||
modification, are permitted provided that the following conditions
|
|
||||||
are met:
|
|
||||||
|
|
||||||
- Redistributions of source code must retain the above copyright
|
|
||||||
notice, this list of conditions and the following disclaimer.
|
|
||||||
|
|
||||||
- Redistributions in binary form must reproduce the above copyright
|
|
||||||
notice, this list of conditions and the following disclaimer in the
|
|
||||||
documentation and/or other materials provided with the distribution.
|
|
||||||
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
||||||
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
||||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
||||||
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
|
|
||||||
OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
|
||||||
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
|
||||||
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
|
||||||
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
|
||||||
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @file opus.h
|
|
||||||
* @brief Opus reference implementation API
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef OPUS_H
|
|
||||||
#define OPUS_H
|
|
||||||
|
|
||||||
#include "opus_types.h"
|
|
||||||
#include "opus_defines.h"
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @mainpage Opus
|
|
||||||
*
|
|
||||||
* The Opus codec is designed for interactive speech and audio transmission over the Internet.
|
|
||||||
* It is designed by the IETF Codec Working Group and incorporates technology from
|
|
||||||
* Skype's SILK codec and Xiph.Org's CELT codec.
|
|
||||||
*
|
|
||||||
* The Opus codec is designed to handle a wide range of interactive audio applications,
|
|
||||||
* including Voice over IP, videoconferencing, in-game chat, and even remote live music
|
|
||||||
* performances. It can scale from low bit-rate narrowband speech to very high quality
|
|
||||||
* stereo music. Its main features are:
|
|
||||||
|
|
||||||
* @li Sampling rates from 8 to 48 kHz
|
|
||||||
* @li Bit-rates from 6 kb/s to 510 kb/s
|
|
||||||
* @li Support for both constant bit-rate (CBR) and variable bit-rate (VBR)
|
|
||||||
* @li Audio bandwidth from narrowband to full-band
|
|
||||||
* @li Support for speech and music
|
|
||||||
* @li Support for mono and stereo
|
|
||||||
* @li Support for multichannel (up to 255 channels)
|
|
||||||
* @li Frame sizes from 2.5 ms to 60 ms
|
|
||||||
* @li Good loss robustness and packet loss concealment (PLC)
|
|
||||||
* @li Floating point and fixed-point implementation
|
|
||||||
*
|
|
||||||
* Documentation sections:
|
|
||||||
* @li @ref opus_encoder
|
|
||||||
* @li @ref opus_decoder
|
|
||||||
* @li @ref opus_repacketizer
|
|
||||||
* @li @ref opus_multistream
|
|
||||||
* @li @ref opus_libinfo
|
|
||||||
* @li @ref opus_custom
|
|
||||||
*/
|
|
||||||
|
|
||||||
/** @defgroup opus_encoder Opus Encoder
|
|
||||||
* @{
|
|
||||||
*
|
|
||||||
* @brief This page describes the process and functions used to encode Opus.
|
|
||||||
*
|
|
||||||
* Since Opus is a stateful codec, the encoding process starts with creating an encoder
|
|
||||||
* state. This can be done with:
|
|
||||||
*
|
|
||||||
* @code
|
|
||||||
* int error;
|
|
||||||
* OpusEncoder *enc;
|
|
||||||
* enc = opus_encoder_create(Fs, channels, application, &error);
|
|
||||||
* @endcode
|
|
||||||
*
|
|
||||||
* From this point, @c enc can be used for encoding an audio stream. An encoder state
|
|
||||||
* @b must @b not be used for more than one stream at the same time. Similarly, the encoder
|
|
||||||
* state @b must @b not be re-initialized for each frame.
|
|
||||||
*
|
|
||||||
* While opus_encoder_create() allocates memory for the state, it's also possible
|
|
||||||
* to initialize pre-allocated memory:
|
|
||||||
*
|
|
||||||
* @code
|
|
||||||
* int size;
|
|
||||||
* int error;
|
|
||||||
* OpusEncoder *enc;
|
|
||||||
* size = opus_encoder_get_size(channels);
|
|
||||||
* enc = malloc(size);
|
|
||||||
* error = opus_encoder_init(enc, Fs, channels, application);
|
|
||||||
* @endcode
|
|
||||||
*
|
|
||||||
* where opus_encoder_get_size() returns the required size for the encoder state. Note that
|
|
||||||
* future versions of this code may change the size, so no assuptions should be made about it.
|
|
||||||
*
|
|
||||||
* The encoder state is always continuous in memory and only a shallow copy is sufficient
|
|
||||||
* to copy it (e.g. memcpy())
|
|
||||||
*
|
|
||||||
* It is possible to change some of the encoder's settings using the opus_encoder_ctl()
|
|
||||||
* interface. All these settings already default to the recommended value, so they should
|
|
||||||
* only be changed when necessary. The most common settings one may want to change are:
|
|
||||||
*
|
|
||||||
* @code
|
|
||||||
* opus_encoder_ctl(enc, OPUS_SET_BITRATE(bitrate));
|
|
||||||
* opus_encoder_ctl(enc, OPUS_SET_COMPLEXITY(complexity));
|
|
||||||
* opus_encoder_ctl(enc, OPUS_SET_SIGNAL(signal_type));
|
|
||||||
* @endcode
|
|
||||||
*
|
|
||||||
* where
|
|
||||||
*
|
|
||||||
* @arg bitrate is in bits per second (b/s)
|
|
||||||
* @arg complexity is a value from 1 to 10, where 1 is the lowest complexity and 10 is the highest
|
|
||||||
* @arg signal_type is either OPUS_AUTO (default), OPUS_SIGNAL_VOICE, or OPUS_SIGNAL_MUSIC
|
|
||||||
*
|
|
||||||
* See @ref opus_encoderctls and @ref opus_genericctls for a complete list of parameters that can be set or queried. Most parameters can be set or changed at any time during a stream.
|
|
||||||
*
|
|
||||||
* To encode a frame, opus_encode() or opus_encode_float() must be called with exactly one frame (2.5, 5, 10, 20, 40 or 60 ms) of audio data:
|
|
||||||
* @code
|
|
||||||
* len = opus_encode(enc, audio_frame, frame_size, packet, max_packet);
|
|
||||||
* @endcode
|
|
||||||
*
|
|
||||||
* where
|
|
||||||
* <ul>
|
|
||||||
* <li>audio_frame is the audio data in opus_int16 (or float for opus_encode_float())</li>
|
|
||||||
* <li>frame_size is the duration of the frame in samples (per channel)</li>
|
|
||||||
* <li>packet is the byte array to which the compressed data is written</li>
|
|
||||||
* <li>max_packet is the maximum number of bytes that can be written in the packet (4000 bytes is recommended).
|
|
||||||
* Do not use max_packet to control VBR target bitrate, instead use the #OPUS_SET_BITRATE CTL.</li>
|
|
||||||
* </ul>
|
|
||||||
*
|
|
||||||
* opus_encode() and opus_encode_float() return the number of bytes actually written to the packet.
|
|
||||||
* The return value <b>can be negative</b>, which indicates that an error has occurred. If the return value
|
|
||||||
* is 2 bytes or less, then the packet does not need to be transmitted (DTX).
|
|
||||||
*
|
|
||||||
* Once the encoder state if no longer needed, it can be destroyed with
|
|
||||||
*
|
|
||||||
* @code
|
|
||||||
* opus_encoder_destroy(enc);
|
|
||||||
* @endcode
|
|
||||||
*
|
|
||||||
* If the encoder was created with opus_encoder_init() rather than opus_encoder_create(),
|
|
||||||
* then no action is required aside from potentially freeing the memory that was manually
|
|
||||||
* allocated for it (calling free(enc) for the example above)
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
/** Opus encoder state.
|
|
||||||
* This contains the complete state of an Opus encoder.
|
|
||||||
* It is position independent and can be freely copied.
|
|
||||||
* @see opus_encoder_create,opus_encoder_init
|
|
||||||
*/
|
|
||||||
typedef struct OpusEncoder OpusEncoder;
|
|
||||||
|
|
||||||
/** Gets the size of an <code>OpusEncoder</code> structure.
|
|
||||||
* @param[in] channels <tt>int</tt>: Number of channels.
|
|
||||||
* This must be 1 or 2.
|
|
||||||
* @returns The size in bytes.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_encoder_get_size(int channels);
|
|
||||||
|
|
||||||
/**
|
|
||||||
*/
|
|
||||||
|
|
||||||
/** Allocates and initializes an encoder state.
|
|
||||||
* There are three coding modes:
|
|
||||||
*
|
|
||||||
* @ref OPUS_APPLICATION_VOIP gives best quality at a given bitrate for voice
|
|
||||||
* signals. It enhances the input signal by high-pass filtering and
|
|
||||||
* emphasizing formants and harmonics. Optionally it includes in-band
|
|
||||||
* forward error correction to protect against packet loss. Use this
|
|
||||||
* mode for typical VoIP applications. Because of the enhancement,
|
|
||||||
* even at high bitrates the output may sound different from the input.
|
|
||||||
*
|
|
||||||
* @ref OPUS_APPLICATION_AUDIO gives best quality at a given bitrate for most
|
|
||||||
* non-voice signals like music. Use this mode for music and mixed
|
|
||||||
* (music/voice) content, broadcast, and applications requiring less
|
|
||||||
* than 15 ms of coding delay.
|
|
||||||
*
|
|
||||||
* @ref OPUS_APPLICATION_RESTRICTED_LOWDELAY configures low-delay mode that
|
|
||||||
* disables the speech-optimized mode in exchange for slightly reduced delay.
|
|
||||||
* This mode can only be set on an newly initialized or freshly reset encoder
|
|
||||||
* because it changes the codec delay.
|
|
||||||
*
|
|
||||||
* This is useful when the caller knows that the speech-optimized modes will not be needed (use with caution).
|
|
||||||
* @param [in] Fs <tt>opus_int32</tt>: Sampling rate of input signal (Hz)
|
|
||||||
* This must be one of 8000, 12000, 16000,
|
|
||||||
* 24000, or 48000.
|
|
||||||
* @param [in] channels <tt>int</tt>: Number of channels (1 or 2) in input signal
|
|
||||||
* @param [in] application <tt>int</tt>: Coding mode (@ref OPUS_APPLICATION_VOIP/@ref OPUS_APPLICATION_AUDIO/@ref OPUS_APPLICATION_RESTRICTED_LOWDELAY)
|
|
||||||
* @param [out] error <tt>int*</tt>: @ref opus_errorcodes
|
|
||||||
* @note Regardless of the sampling rate and number channels selected, the Opus encoder
|
|
||||||
* can switch to a lower audio bandwidth or number of channels if the bitrate
|
|
||||||
* selected is too low. This also means that it is safe to always use 48 kHz stereo input
|
|
||||||
* and let the encoder optimize the encoding.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusEncoder *opus_encoder_create(
|
|
||||||
opus_int32 Fs,
|
|
||||||
int channels,
|
|
||||||
int application,
|
|
||||||
int *error
|
|
||||||
);
|
|
||||||
|
|
||||||
/** Initializes a previously allocated encoder state
|
|
||||||
* The memory pointed to by st must be at least the size returned by opus_encoder_get_size().
|
|
||||||
* This is intended for applications which use their own allocator instead of malloc.
|
|
||||||
* @see opus_encoder_create(),opus_encoder_get_size()
|
|
||||||
* To reset a previously initialized state, use the #OPUS_RESET_STATE CTL.
|
|
||||||
* @param [in] st <tt>OpusEncoder*</tt>: Encoder state
|
|
||||||
* @param [in] Fs <tt>opus_int32</tt>: Sampling rate of input signal (Hz)
|
|
||||||
* This must be one of 8000, 12000, 16000,
|
|
||||||
* 24000, or 48000.
|
|
||||||
* @param [in] channels <tt>int</tt>: Number of channels (1 or 2) in input signal
|
|
||||||
* @param [in] application <tt>int</tt>: Coding mode (OPUS_APPLICATION_VOIP/OPUS_APPLICATION_AUDIO/OPUS_APPLICATION_RESTRICTED_LOWDELAY)
|
|
||||||
* @retval #OPUS_OK Success or @ref opus_errorcodes
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT int opus_encoder_init(
|
|
||||||
OpusEncoder *st,
|
|
||||||
opus_int32 Fs,
|
|
||||||
int channels,
|
|
||||||
int application
|
|
||||||
) OPUS_ARG_NONNULL(1);
|
|
||||||
|
|
||||||
/** Encodes an Opus frame.
|
|
||||||
* @param [in] st <tt>OpusEncoder*</tt>: Encoder state
|
|
||||||
* @param [in] pcm <tt>opus_int16*</tt>: Input signal (interleaved if 2 channels). length is frame_size*channels*sizeof(opus_int16)
|
|
||||||
* @param [in] frame_size <tt>int</tt>: Number of samples per channel in the
|
|
||||||
* input signal.
|
|
||||||
* This must be an Opus frame size for
|
|
||||||
* the encoder's sampling rate.
|
|
||||||
* For example, at 48 kHz the permitted
|
|
||||||
* values are 120, 240, 480, 960, 1920,
|
|
||||||
* and 2880.
|
|
||||||
* Passing in a duration of less than
|
|
||||||
* 10 ms (480 samples at 48 kHz) will
|
|
||||||
* prevent the encoder from using the LPC
|
|
||||||
* or hybrid modes.
|
|
||||||
* @param [out] data <tt>unsigned char*</tt>: Output payload.
|
|
||||||
* This must contain storage for at
|
|
||||||
* least \a max_data_bytes.
|
|
||||||
* @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
|
|
||||||
* memory for the output
|
|
||||||
* payload. This may be
|
|
||||||
* used to impose an upper limit on
|
|
||||||
* the instant bitrate, but should
|
|
||||||
* not be used as the only bitrate
|
|
||||||
* control. Use #OPUS_SET_BITRATE to
|
|
||||||
* control the bitrate.
|
|
||||||
* @returns The length of the encoded packet (in bytes) on success or a
|
|
||||||
* negative error code (see @ref opus_errorcodes) on failure.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_encode(
|
|
||||||
OpusEncoder *st,
|
|
||||||
const opus_int16 *pcm,
|
|
||||||
int frame_size,
|
|
||||||
unsigned char *data,
|
|
||||||
opus_int32 max_data_bytes
|
|
||||||
) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
|
|
||||||
|
|
||||||
/** Encodes an Opus frame from floating point input.
|
|
||||||
* @param [in] st <tt>OpusEncoder*</tt>: Encoder state
|
|
||||||
* @param [in] pcm <tt>float*</tt>: Input in float format (interleaved if 2 channels), with a normal range of +/-1.0.
|
|
||||||
* Samples with a range beyond +/-1.0 are supported but will
|
|
||||||
* be clipped by decoders using the integer API and should
|
|
||||||
* only be used if it is known that the far end supports
|
|
||||||
* extended dynamic range.
|
|
||||||
* length is frame_size*channels*sizeof(float)
|
|
||||||
* @param [in] frame_size <tt>int</tt>: Number of samples per channel in the
|
|
||||||
* input signal.
|
|
||||||
* This must be an Opus frame size for
|
|
||||||
* the encoder's sampling rate.
|
|
||||||
* For example, at 48 kHz the permitted
|
|
||||||
* values are 120, 240, 480, 960, 1920,
|
|
||||||
* and 2880.
|
|
||||||
* Passing in a duration of less than
|
|
||||||
* 10 ms (480 samples at 48 kHz) will
|
|
||||||
* prevent the encoder from using the LPC
|
|
||||||
* or hybrid modes.
|
|
||||||
* @param [out] data <tt>unsigned char*</tt>: Output payload.
|
|
||||||
* This must contain storage for at
|
|
||||||
* least \a max_data_bytes.
|
|
||||||
* @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
|
|
||||||
* memory for the output
|
|
||||||
* payload. This may be
|
|
||||||
* used to impose an upper limit on
|
|
||||||
* the instant bitrate, but should
|
|
||||||
* not be used as the only bitrate
|
|
||||||
* control. Use #OPUS_SET_BITRATE to
|
|
||||||
* control the bitrate.
|
|
||||||
* @returns The length of the encoded packet (in bytes) on success or a
|
|
||||||
* negative error code (see @ref opus_errorcodes) on failure.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_encode_float(
|
|
||||||
OpusEncoder *st,
|
|
||||||
const float *pcm,
|
|
||||||
int frame_size,
|
|
||||||
unsigned char *data,
|
|
||||||
opus_int32 max_data_bytes
|
|
||||||
) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
|
|
||||||
|
|
||||||
/** Frees an <code>OpusEncoder</code> allocated by opus_encoder_create().
|
|
||||||
* @param[in] st <tt>OpusEncoder*</tt>: State to be freed.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT void opus_encoder_destroy(OpusEncoder *st);
|
|
||||||
|
|
||||||
/** Perform a CTL function on an Opus encoder.
|
|
||||||
*
|
|
||||||
* Generally the request and subsequent arguments are generated
|
|
||||||
* by a convenience macro.
|
|
||||||
* @param st <tt>OpusEncoder*</tt>: Encoder state.
|
|
||||||
* @param request This and all remaining parameters should be replaced by one
|
|
||||||
* of the convenience macros in @ref opus_genericctls or
|
|
||||||
* @ref opus_encoderctls.
|
|
||||||
* @see opus_genericctls
|
|
||||||
* @see opus_encoderctls
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT int opus_encoder_ctl(OpusEncoder *st, int request, ...) OPUS_ARG_NONNULL(1);
|
|
||||||
/**@}*/
|
|
||||||
|
|
||||||
/** @defgroup opus_decoder Opus Decoder
|
|
||||||
* @{
|
|
||||||
*
|
|
||||||
* @brief This page describes the process and functions used to decode Opus.
|
|
||||||
*
|
|
||||||
* The decoding process also starts with creating a decoder
|
|
||||||
* state. This can be done with:
|
|
||||||
* @code
|
|
||||||
* int error;
|
|
||||||
* OpusDecoder *dec;
|
|
||||||
* dec = opus_decoder_create(Fs, channels, &error);
|
|
||||||
* @endcode
|
|
||||||
* where
|
|
||||||
* @li Fs is the sampling rate and must be 8000, 12000, 16000, 24000, or 48000
|
|
||||||
* @li channels is the number of channels (1 or 2)
|
|
||||||
* @li error will hold the error code in case of failure (or #OPUS_OK on success)
|
|
||||||
* @li the return value is a newly created decoder state to be used for decoding
|
|
||||||
*
|
|
||||||
* While opus_decoder_create() allocates memory for the state, it's also possible
|
|
||||||
* to initialize pre-allocated memory:
|
|
||||||
* @code
|
|
||||||
* int size;
|
|
||||||
* int error;
|
|
||||||
* OpusDecoder *dec;
|
|
||||||
* size = opus_decoder_get_size(channels);
|
|
||||||
* dec = malloc(size);
|
|
||||||
* error = opus_decoder_init(dec, Fs, channels);
|
|
||||||
* @endcode
|
|
||||||
* where opus_decoder_get_size() returns the required size for the decoder state. Note that
|
|
||||||
* future versions of this code may change the size, so no assuptions should be made about it.
|
|
||||||
*
|
|
||||||
* The decoder state is always continuous in memory and only a shallow copy is sufficient
|
|
||||||
* to copy it (e.g. memcpy())
|
|
||||||
*
|
|
||||||
* To decode a frame, opus_decode() or opus_decode_float() must be called with a packet of compressed audio data:
|
|
||||||
* @code
|
|
||||||
* frame_size = opus_decode(dec, packet, len, decoded, max_size, 0);
|
|
||||||
* @endcode
|
|
||||||
* where
|
|
||||||
*
|
|
||||||
* @li packet is the byte array containing the compressed data
|
|
||||||
* @li len is the exact number of bytes contained in the packet
|
|
||||||
* @li decoded is the decoded audio data in opus_int16 (or float for opus_decode_float())
|
|
||||||
* @li max_size is the max duration of the frame in samples (per channel) that can fit into the decoded_frame array
|
|
||||||
*
|
|
||||||
* opus_decode() and opus_decode_float() return the number of samples (per channel) decoded from the packet.
|
|
||||||
* If that value is negative, then an error has occurred. This can occur if the packet is corrupted or if the audio
|
|
||||||
* buffer is too small to hold the decoded audio.
|
|
||||||
*
|
|
||||||
* Opus is a stateful codec with overlapping blocks and as a result Opus
|
|
||||||
* packets are not coded independently of each other. Packets must be
|
|
||||||
* passed into the decoder serially and in the correct order for a correct
|
|
||||||
* decode. Lost packets can be replaced with loss concealment by calling
|
|
||||||
* the decoder with a null pointer and zero length for the missing packet.
|
|
||||||
*
|
|
||||||
* A single codec state may only be accessed from a single thread at
|
|
||||||
* a time and any required locking must be performed by the caller. Separate
|
|
||||||
* streams must be decoded with separate decoder states and can be decoded
|
|
||||||
* in parallel unless the library was compiled with NONTHREADSAFE_PSEUDOSTACK
|
|
||||||
* defined.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
/** Opus decoder state.
|
|
||||||
* This contains the complete state of an Opus decoder.
|
|
||||||
* It is position independent and can be freely copied.
|
|
||||||
* @see opus_decoder_create,opus_decoder_init
|
|
||||||
*/
|
|
||||||
typedef struct OpusDecoder OpusDecoder;
|
|
||||||
|
|
||||||
/** Gets the size of an <code>OpusDecoder</code> structure.
|
|
||||||
* @param [in] channels <tt>int</tt>: Number of channels.
|
|
||||||
* This must be 1 or 2.
|
|
||||||
* @returns The size in bytes.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_decoder_get_size(int channels);
|
|
||||||
|
|
||||||
/** Allocates and initializes a decoder state.
|
|
||||||
* @param [in] Fs <tt>opus_int32</tt>: Sample rate to decode at (Hz).
|
|
||||||
* This must be one of 8000, 12000, 16000,
|
|
||||||
* 24000, or 48000.
|
|
||||||
* @param [in] channels <tt>int</tt>: Number of channels (1 or 2) to decode
|
|
||||||
* @param [out] error <tt>int*</tt>: #OPUS_OK Success or @ref opus_errorcodes
|
|
||||||
*
|
|
||||||
* Internally Opus stores data at 48000 Hz, so that should be the default
|
|
||||||
* value for Fs. However, the decoder can efficiently decode to buffers
|
|
||||||
* at 8, 12, 16, and 24 kHz so if for some reason the caller cannot use
|
|
||||||
* data at the full sample rate, or knows the compressed data doesn't
|
|
||||||
* use the full frequency range, it can request decoding at a reduced
|
|
||||||
* rate. Likewise, the decoder is capable of filling in either mono or
|
|
||||||
* interleaved stereo pcm buffers, at the caller's request.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusDecoder *opus_decoder_create(
|
|
||||||
opus_int32 Fs,
|
|
||||||
int channels,
|
|
||||||
int *error
|
|
||||||
);
|
|
||||||
|
|
||||||
/** Initializes a previously allocated decoder state.
|
|
||||||
* The state must be at least the size returned by opus_decoder_get_size().
|
|
||||||
* This is intended for applications which use their own allocator instead of malloc. @see opus_decoder_create,opus_decoder_get_size
|
|
||||||
* To reset a previously initialized state, use the #OPUS_RESET_STATE CTL.
|
|
||||||
* @param [in] st <tt>OpusDecoder*</tt>: Decoder state.
|
|
||||||
* @param [in] Fs <tt>opus_int32</tt>: Sampling rate to decode to (Hz).
|
|
||||||
* This must be one of 8000, 12000, 16000,
|
|
||||||
* 24000, or 48000.
|
|
||||||
* @param [in] channels <tt>int</tt>: Number of channels (1 or 2) to decode
|
|
||||||
* @retval #OPUS_OK Success or @ref opus_errorcodes
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT int opus_decoder_init(
|
|
||||||
OpusDecoder *st,
|
|
||||||
opus_int32 Fs,
|
|
||||||
int channels
|
|
||||||
) OPUS_ARG_NONNULL(1);
|
|
||||||
|
|
||||||
/** Decode an Opus packet.
|
|
||||||
* @param [in] st <tt>OpusDecoder*</tt>: Decoder state
|
|
||||||
* @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
|
|
||||||
* @param [in] len <tt>opus_int32</tt>: Number of bytes in payload*
|
|
||||||
* @param [out] pcm <tt>opus_int16*</tt>: Output signal (interleaved if 2 channels). length
|
|
||||||
* is frame_size*channels*sizeof(opus_int16)
|
|
||||||
* @param [in] frame_size Number of samples per channel of available space in \a pcm.
|
|
||||||
* If this is less than the maximum packet duration (120ms; 5760 for 48kHz), this function will
|
|
||||||
* not be capable of decoding some packets. In the case of PLC (data==NULL) or FEC (decode_fec=1),
|
|
||||||
* then frame_size needs to be exactly the duration of audio that is missing, otherwise the
|
|
||||||
* decoder will not be in the optimal state to decode the next incoming packet. For the PLC and
|
|
||||||
* FEC cases, frame_size <b>must</b> be a multiple of 2.5 ms.
|
|
||||||
* @param [in] decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band forward error correction data be
|
|
||||||
* decoded. If no such data is available, the frame is decoded as if it were lost.
|
|
||||||
* @returns Number of decoded samples or @ref opus_errorcodes
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_decode(
|
|
||||||
OpusDecoder *st,
|
|
||||||
const unsigned char *data,
|
|
||||||
opus_int32 len,
|
|
||||||
opus_int16 *pcm,
|
|
||||||
int frame_size,
|
|
||||||
int decode_fec
|
|
||||||
) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
|
|
||||||
|
|
||||||
/** Decode an Opus packet with floating point output.
|
|
||||||
* @param [in] st <tt>OpusDecoder*</tt>: Decoder state
|
|
||||||
* @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
|
|
||||||
* @param [in] len <tt>opus_int32</tt>: Number of bytes in payload
|
|
||||||
* @param [out] pcm <tt>float*</tt>: Output signal (interleaved if 2 channels). length
|
|
||||||
* is frame_size*channels*sizeof(float)
|
|
||||||
* @param [in] frame_size Number of samples per channel of available space in \a pcm.
|
|
||||||
* If this is less than the maximum packet duration (120ms; 5760 for 48kHz), this function will
|
|
||||||
* not be capable of decoding some packets. In the case of PLC (data==NULL) or FEC (decode_fec=1),
|
|
||||||
* then frame_size needs to be exactly the duration of audio that is missing, otherwise the
|
|
||||||
* decoder will not be in the optimal state to decode the next incoming packet. For the PLC and
|
|
||||||
* FEC cases, frame_size <b>must</b> be a multiple of 2.5 ms.
|
|
||||||
* @param [in] decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band forward error correction data be
|
|
||||||
* decoded. If no such data is available the frame is decoded as if it were lost.
|
|
||||||
* @returns Number of decoded samples or @ref opus_errorcodes
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_decode_float(
|
|
||||||
OpusDecoder *st,
|
|
||||||
const unsigned char *data,
|
|
||||||
opus_int32 len,
|
|
||||||
float *pcm,
|
|
||||||
int frame_size,
|
|
||||||
int decode_fec
|
|
||||||
) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
|
|
||||||
|
|
||||||
/** Perform a CTL function on an Opus decoder.
|
|
||||||
*
|
|
||||||
* Generally the request and subsequent arguments are generated
|
|
||||||
* by a convenience macro.
|
|
||||||
* @param st <tt>OpusDecoder*</tt>: Decoder state.
|
|
||||||
* @param request This and all remaining parameters should be replaced by one
|
|
||||||
* of the convenience macros in @ref opus_genericctls or
|
|
||||||
* @ref opus_decoderctls.
|
|
||||||
* @see opus_genericctls
|
|
||||||
* @see opus_decoderctls
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT int opus_decoder_ctl(OpusDecoder *st, int request, ...) OPUS_ARG_NONNULL(1);
|
|
||||||
|
|
||||||
/** Frees an <code>OpusDecoder</code> allocated by opus_decoder_create().
|
|
||||||
* @param[in] st <tt>OpusDecoder*</tt>: State to be freed.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT void opus_decoder_destroy(OpusDecoder *st);
|
|
||||||
|
|
||||||
/** Parse an opus packet into one or more frames.
|
|
||||||
* Opus_decode will perform this operation internally so most applications do
|
|
||||||
* not need to use this function.
|
|
||||||
* This function does not copy the frames, the returned pointers are pointers into
|
|
||||||
* the input packet.
|
|
||||||
* @param [in] data <tt>char*</tt>: Opus packet to be parsed
|
|
||||||
* @param [in] len <tt>opus_int32</tt>: size of data
|
|
||||||
* @param [out] out_toc <tt>char*</tt>: TOC pointer
|
|
||||||
* @param [out] frames <tt>char*[48]</tt> encapsulated frames
|
|
||||||
* @param [out] size <tt>opus_int16[48]</tt> sizes of the encapsulated frames
|
|
||||||
* @param [out] payload_offset <tt>int*</tt>: returns the position of the payload within the packet (in bytes)
|
|
||||||
* @returns number of frames
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT int opus_packet_parse(
|
|
||||||
const unsigned char *data,
|
|
||||||
opus_int32 len,
|
|
||||||
unsigned char *out_toc,
|
|
||||||
const unsigned char *frames[48],
|
|
||||||
opus_int16 size[48],
|
|
||||||
int *payload_offset
|
|
||||||
) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(5);
|
|
||||||
|
|
||||||
/** Gets the bandwidth of an Opus packet.
|
|
||||||
* @param [in] data <tt>char*</tt>: Opus packet
|
|
||||||
* @retval OPUS_BANDWIDTH_NARROWBAND Narrowband (4kHz bandpass)
|
|
||||||
* @retval OPUS_BANDWIDTH_MEDIUMBAND Mediumband (6kHz bandpass)
|
|
||||||
* @retval OPUS_BANDWIDTH_WIDEBAND Wideband (8kHz bandpass)
|
|
||||||
* @retval OPUS_BANDWIDTH_SUPERWIDEBAND Superwideband (12kHz bandpass)
|
|
||||||
* @retval OPUS_BANDWIDTH_FULLBAND Fullband (20kHz bandpass)
|
|
||||||
* @retval OPUS_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_packet_get_bandwidth(const unsigned char *data) OPUS_ARG_NONNULL(1);
|
|
||||||
|
|
||||||
/** Gets the number of samples per frame from an Opus packet.
|
|
||||||
* @param [in] data <tt>char*</tt>: Opus packet.
|
|
||||||
* This must contain at least one byte of
|
|
||||||
* data.
|
|
||||||
* @param [in] Fs <tt>opus_int32</tt>: Sampling rate in Hz.
|
|
||||||
* This must be a multiple of 400, or
|
|
||||||
* inaccurate results will be returned.
|
|
||||||
* @returns Number of samples per frame.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_packet_get_samples_per_frame(const unsigned char *data, opus_int32 Fs) OPUS_ARG_NONNULL(1);
|
|
||||||
|
|
||||||
/** Gets the number of channels from an Opus packet.
|
|
||||||
* @param [in] data <tt>char*</tt>: Opus packet
|
|
||||||
* @returns Number of channels
|
|
||||||
* @retval OPUS_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_packet_get_nb_channels(const unsigned char *data) OPUS_ARG_NONNULL(1);
|
|
||||||
|
|
||||||
/** Gets the number of frames in an Opus packet.
|
|
||||||
* @param [in] packet <tt>char*</tt>: Opus packet
|
|
||||||
* @param [in] len <tt>opus_int32</tt>: Length of packet
|
|
||||||
* @returns Number of frames
|
|
||||||
* @retval OPUS_BAD_ARG Insufficient data was passed to the function
|
|
||||||
* @retval OPUS_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_packet_get_nb_frames(const unsigned char packet[], opus_int32 len) OPUS_ARG_NONNULL(1);
|
|
||||||
|
|
||||||
/** Gets the number of samples of an Opus packet.
|
|
||||||
* @param [in] packet <tt>char*</tt>: Opus packet
|
|
||||||
* @param [in] len <tt>opus_int32</tt>: Length of packet
|
|
||||||
* @param [in] Fs <tt>opus_int32</tt>: Sampling rate in Hz.
|
|
||||||
* This must be a multiple of 400, or
|
|
||||||
* inaccurate results will be returned.
|
|
||||||
* @returns Number of samples
|
|
||||||
* @retval OPUS_BAD_ARG Insufficient data was passed to the function
|
|
||||||
* @retval OPUS_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_packet_get_nb_samples(const unsigned char packet[], opus_int32 len, opus_int32 Fs) OPUS_ARG_NONNULL(1);
|
|
||||||
|
|
||||||
/** Gets the number of samples of an Opus packet.
|
|
||||||
* @param [in] dec <tt>OpusDecoder*</tt>: Decoder state
|
|
||||||
* @param [in] packet <tt>char*</tt>: Opus packet
|
|
||||||
* @param [in] len <tt>opus_int32</tt>: Length of packet
|
|
||||||
* @returns Number of samples
|
|
||||||
* @retval OPUS_BAD_ARG Insufficient data was passed to the function
|
|
||||||
* @retval OPUS_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_decoder_get_nb_samples(const OpusDecoder *dec, const unsigned char packet[], opus_int32 len) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2);
|
|
||||||
|
|
||||||
/** Applies soft-clipping to bring a float signal within the [-1,1] range. If
|
|
||||||
* the signal is already in that range, nothing is done. If there are values
|
|
||||||
* outside of [-1,1], then the signal is clipped as smoothly as possible to
|
|
||||||
* both fit in the range and avoid creating excessive distortion in the
|
|
||||||
* process.
|
|
||||||
* @param [in,out] pcm <tt>float*</tt>: Input PCM and modified PCM
|
|
||||||
* @param [in] frame_size <tt>int</tt> Number of samples per channel to process
|
|
||||||
* @param [in] channels <tt>int</tt>: Number of channels
|
|
||||||
* @param [in,out] softclip_mem <tt>float*</tt>: State memory for the soft clipping process (one float per channel, initialized to zero)
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT void opus_pcm_soft_clip(float *pcm, int frame_size, int channels, float *softclip_mem);
|
|
||||||
|
|
||||||
|
|
||||||
/**@}*/
|
|
||||||
|
|
||||||
/** @defgroup opus_repacketizer Repacketizer
|
|
||||||
* @{
|
|
||||||
*
|
|
||||||
* The repacketizer can be used to merge multiple Opus packets into a single
|
|
||||||
* packet or alternatively to split Opus packets that have previously been
|
|
||||||
* merged. Splitting valid Opus packets is always guaranteed to succeed,
|
|
||||||
* whereas merging valid packets only succeeds if all frames have the same
|
|
||||||
* mode, bandwidth, and frame size, and when the total duration of the merged
|
|
||||||
* packet is no more than 120 ms. The 120 ms limit comes from the
|
|
||||||
* specification and limits decoder memory requirements at a point where
|
|
||||||
* framing overhead becomes negligible.
|
|
||||||
*
|
|
||||||
* The repacketizer currently only operates on elementary Opus
|
|
||||||
* streams. It will not manipualte multistream packets successfully, except in
|
|
||||||
* the degenerate case where they consist of data from a single stream.
|
|
||||||
*
|
|
||||||
* The repacketizing process starts with creating a repacketizer state, either
|
|
||||||
* by calling opus_repacketizer_create() or by allocating the memory yourself,
|
|
||||||
* e.g.,
|
|
||||||
* @code
|
|
||||||
* OpusRepacketizer *rp;
|
|
||||||
* rp = (OpusRepacketizer*)malloc(opus_repacketizer_get_size());
|
|
||||||
* if (rp != NULL)
|
|
||||||
* opus_repacketizer_init(rp);
|
|
||||||
* @endcode
|
|
||||||
*
|
|
||||||
* Then the application should submit packets with opus_repacketizer_cat(),
|
|
||||||
* extract new packets with opus_repacketizer_out() or
|
|
||||||
* opus_repacketizer_out_range(), and then reset the state for the next set of
|
|
||||||
* input packets via opus_repacketizer_init().
|
|
||||||
*
|
|
||||||
* For example, to split a sequence of packets into individual frames:
|
|
||||||
* @code
|
|
||||||
* unsigned char *data;
|
|
||||||
* int len;
|
|
||||||
* while (get_next_packet(&data, &len))
|
|
||||||
* {
|
|
||||||
* unsigned char out[1276];
|
|
||||||
* opus_int32 out_len;
|
|
||||||
* int nb_frames;
|
|
||||||
* int err;
|
|
||||||
* int i;
|
|
||||||
* err = opus_repacketizer_cat(rp, data, len);
|
|
||||||
* if (err != OPUS_OK)
|
|
||||||
* {
|
|
||||||
* release_packet(data);
|
|
||||||
* return err;
|
|
||||||
* }
|
|
||||||
* nb_frames = opus_repacketizer_get_nb_frames(rp);
|
|
||||||
* for (i = 0; i < nb_frames; i++)
|
|
||||||
* {
|
|
||||||
* out_len = opus_repacketizer_out_range(rp, i, i+1, out, sizeof(out));
|
|
||||||
* if (out_len < 0)
|
|
||||||
* {
|
|
||||||
* release_packet(data);
|
|
||||||
* return (int)out_len;
|
|
||||||
* }
|
|
||||||
* output_next_packet(out, out_len);
|
|
||||||
* }
|
|
||||||
* opus_repacketizer_init(rp);
|
|
||||||
* release_packet(data);
|
|
||||||
* }
|
|
||||||
* @endcode
|
|
||||||
*
|
|
||||||
* Alternatively, to combine a sequence of frames into packets that each
|
|
||||||
* contain up to <code>TARGET_DURATION_MS</code> milliseconds of data:
|
|
||||||
* @code
|
|
||||||
* // The maximum number of packets with duration TARGET_DURATION_MS occurs
|
|
||||||
* // when the frame size is 2.5 ms, for a total of (TARGET_DURATION_MS*2/5)
|
|
||||||
* // packets.
|
|
||||||
* unsigned char *data[(TARGET_DURATION_MS*2/5)+1];
|
|
||||||
* opus_int32 len[(TARGET_DURATION_MS*2/5)+1];
|
|
||||||
* int nb_packets;
|
|
||||||
* unsigned char out[1277*(TARGET_DURATION_MS*2/2)];
|
|
||||||
* opus_int32 out_len;
|
|
||||||
* int prev_toc;
|
|
||||||
* nb_packets = 0;
|
|
||||||
* while (get_next_packet(data+nb_packets, len+nb_packets))
|
|
||||||
* {
|
|
||||||
* int nb_frames;
|
|
||||||
* int err;
|
|
||||||
* nb_frames = opus_packet_get_nb_frames(data[nb_packets], len[nb_packets]);
|
|
||||||
* if (nb_frames < 1)
|
|
||||||
* {
|
|
||||||
* release_packets(data, nb_packets+1);
|
|
||||||
* return nb_frames;
|
|
||||||
* }
|
|
||||||
* nb_frames += opus_repacketizer_get_nb_frames(rp);
|
|
||||||
* // If adding the next packet would exceed our target, or it has an
|
|
||||||
* // incompatible TOC sequence, output the packets we already have before
|
|
||||||
* // submitting it.
|
|
||||||
* // N.B., The nb_packets > 0 check ensures we've submitted at least one
|
|
||||||
* // packet since the last call to opus_repacketizer_init(). Otherwise a
|
|
||||||
* // single packet longer than TARGET_DURATION_MS would cause us to try to
|
|
||||||
* // output an (invalid) empty packet. It also ensures that prev_toc has
|
|
||||||
* // been set to a valid value. Additionally, len[nb_packets] > 0 is
|
|
||||||
* // guaranteed by the call to opus_packet_get_nb_frames() above, so the
|
|
||||||
* // reference to data[nb_packets][0] should be valid.
|
|
||||||
* if (nb_packets > 0 && (
|
|
||||||
* ((prev_toc & 0xFC) != (data[nb_packets][0] & 0xFC)) ||
|
|
||||||
* opus_packet_get_samples_per_frame(data[nb_packets], 48000)*nb_frames >
|
|
||||||
* TARGET_DURATION_MS*48))
|
|
||||||
* {
|
|
||||||
* out_len = opus_repacketizer_out(rp, out, sizeof(out));
|
|
||||||
* if (out_len < 0)
|
|
||||||
* {
|
|
||||||
* release_packets(data, nb_packets+1);
|
|
||||||
* return (int)out_len;
|
|
||||||
* }
|
|
||||||
* output_next_packet(out, out_len);
|
|
||||||
* opus_repacketizer_init(rp);
|
|
||||||
* release_packets(data, nb_packets);
|
|
||||||
* data[0] = data[nb_packets];
|
|
||||||
* len[0] = len[nb_packets];
|
|
||||||
* nb_packets = 0;
|
|
||||||
* }
|
|
||||||
* err = opus_repacketizer_cat(rp, data[nb_packets], len[nb_packets]);
|
|
||||||
* if (err != OPUS_OK)
|
|
||||||
* {
|
|
||||||
* release_packets(data, nb_packets+1);
|
|
||||||
* return err;
|
|
||||||
* }
|
|
||||||
* prev_toc = data[nb_packets][0];
|
|
||||||
* nb_packets++;
|
|
||||||
* }
|
|
||||||
* // Output the final, partial packet.
|
|
||||||
* if (nb_packets > 0)
|
|
||||||
* {
|
|
||||||
* out_len = opus_repacketizer_out(rp, out, sizeof(out));
|
|
||||||
* release_packets(data, nb_packets);
|
|
||||||
* if (out_len < 0)
|
|
||||||
* return (int)out_len;
|
|
||||||
* output_next_packet(out, out_len);
|
|
||||||
* }
|
|
||||||
* @endcode
|
|
||||||
*
|
|
||||||
* An alternate way of merging packets is to simply call opus_repacketizer_cat()
|
|
||||||
* unconditionally until it fails. At that point, the merged packet can be
|
|
||||||
* obtained with opus_repacketizer_out() and the input packet for which
|
|
||||||
* opus_repacketizer_cat() needs to be re-added to a newly reinitialized
|
|
||||||
* repacketizer state.
|
|
||||||
*/
|
|
||||||
|
|
||||||
typedef struct OpusRepacketizer OpusRepacketizer;
|
|
||||||
|
|
||||||
/** Gets the size of an <code>OpusRepacketizer</code> structure.
|
|
||||||
* @returns The size in bytes.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_repacketizer_get_size(void);
|
|
||||||
|
|
||||||
/** (Re)initializes a previously allocated repacketizer state.
|
|
||||||
* The state must be at least the size returned by opus_repacketizer_get_size().
|
|
||||||
* This can be used for applications which use their own allocator instead of
|
|
||||||
* malloc().
|
|
||||||
* It must also be called to reset the queue of packets waiting to be
|
|
||||||
* repacketized, which is necessary if the maximum packet duration of 120 ms
|
|
||||||
* is reached or if you wish to submit packets with a different Opus
|
|
||||||
* configuration (coding mode, audio bandwidth, frame size, or channel count).
|
|
||||||
* Failure to do so will prevent a new packet from being added with
|
|
||||||
* opus_repacketizer_cat().
|
|
||||||
* @see opus_repacketizer_create
|
|
||||||
* @see opus_repacketizer_get_size
|
|
||||||
* @see opus_repacketizer_cat
|
|
||||||
* @param rp <tt>OpusRepacketizer*</tt>: The repacketizer state to
|
|
||||||
* (re)initialize.
|
|
||||||
* @returns A pointer to the same repacketizer state that was passed in.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OpusRepacketizer *opus_repacketizer_init(OpusRepacketizer *rp) OPUS_ARG_NONNULL(1);
|
|
||||||
|
|
||||||
/** Allocates memory and initializes the new repacketizer with
|
|
||||||
* opus_repacketizer_init().
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusRepacketizer *opus_repacketizer_create(void);
|
|
||||||
|
|
||||||
/** Frees an <code>OpusRepacketizer</code> allocated by
|
|
||||||
* opus_repacketizer_create().
|
|
||||||
* @param[in] rp <tt>OpusRepacketizer*</tt>: State to be freed.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT void opus_repacketizer_destroy(OpusRepacketizer *rp);
|
|
||||||
|
|
||||||
/** Add a packet to the current repacketizer state.
|
|
||||||
* This packet must match the configuration of any packets already submitted
|
|
||||||
* for repacketization since the last call to opus_repacketizer_init().
|
|
||||||
* This means that it must have the same coding mode, audio bandwidth, frame
|
|
||||||
* size, and channel count.
|
|
||||||
* This can be checked in advance by examining the top 6 bits of the first
|
|
||||||
* byte of the packet, and ensuring they match the top 6 bits of the first
|
|
||||||
* byte of any previously submitted packet.
|
|
||||||
* The total duration of audio in the repacketizer state also must not exceed
|
|
||||||
* 120 ms, the maximum duration of a single packet, after adding this packet.
|
|
||||||
*
|
|
||||||
* The contents of the current repacketizer state can be extracted into new
|
|
||||||
* packets using opus_repacketizer_out() or opus_repacketizer_out_range().
|
|
||||||
*
|
|
||||||
* In order to add a packet with a different configuration or to add more
|
|
||||||
* audio beyond 120 ms, you must clear the repacketizer state by calling
|
|
||||||
* opus_repacketizer_init().
|
|
||||||
* If a packet is too large to add to the current repacketizer state, no part
|
|
||||||
* of it is added, even if it contains multiple frames, some of which might
|
|
||||||
* fit.
|
|
||||||
* If you wish to be able to add parts of such packets, you should first use
|
|
||||||
* another repacketizer to split the packet into pieces and add them
|
|
||||||
* individually.
|
|
||||||
* @see opus_repacketizer_out_range
|
|
||||||
* @see opus_repacketizer_out
|
|
||||||
* @see opus_repacketizer_init
|
|
||||||
* @param rp <tt>OpusRepacketizer*</tt>: The repacketizer state to which to
|
|
||||||
* add the packet.
|
|
||||||
* @param[in] data <tt>const unsigned char*</tt>: The packet data.
|
|
||||||
* The application must ensure
|
|
||||||
* this pointer remains valid
|
|
||||||
* until the next call to
|
|
||||||
* opus_repacketizer_init() or
|
|
||||||
* opus_repacketizer_destroy().
|
|
||||||
* @param len <tt>opus_int32</tt>: The number of bytes in the packet data.
|
|
||||||
* @returns An error code indicating whether or not the operation succeeded.
|
|
||||||
* @retval #OPUS_OK The packet's contents have been added to the repacketizer
|
|
||||||
* state.
|
|
||||||
* @retval #OPUS_INVALID_PACKET The packet did not have a valid TOC sequence,
|
|
||||||
* the packet's TOC sequence was not compatible
|
|
||||||
* with previously submitted packets (because
|
|
||||||
* the coding mode, audio bandwidth, frame size,
|
|
||||||
* or channel count did not match), or adding
|
|
||||||
* this packet would increase the total amount of
|
|
||||||
* audio stored in the repacketizer state to more
|
|
||||||
* than 120 ms.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT int opus_repacketizer_cat(OpusRepacketizer *rp, const unsigned char *data, opus_int32 len) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2);
|
|
||||||
|
|
||||||
|
|
||||||
/** Construct a new packet from data previously submitted to the repacketizer
|
|
||||||
* state via opus_repacketizer_cat().
|
|
||||||
* @param rp <tt>OpusRepacketizer*</tt>: The repacketizer state from which to
|
|
||||||
* construct the new packet.
|
|
||||||
* @param begin <tt>int</tt>: The index of the first frame in the current
|
|
||||||
* repacketizer state to include in the output.
|
|
||||||
* @param end <tt>int</tt>: One past the index of the last frame in the
|
|
||||||
* current repacketizer state to include in the
|
|
||||||
* output.
|
|
||||||
* @param[out] data <tt>const unsigned char*</tt>: The buffer in which to
|
|
||||||
* store the output packet.
|
|
||||||
* @param maxlen <tt>opus_int32</tt>: The maximum number of bytes to store in
|
|
||||||
* the output buffer. In order to guarantee
|
|
||||||
* success, this should be at least
|
|
||||||
* <code>1276</code> for a single frame,
|
|
||||||
* or for multiple frames,
|
|
||||||
* <code>1277*(end-begin)</code>.
|
|
||||||
* However, <code>1*(end-begin)</code> plus
|
|
||||||
* the size of all packet data submitted to
|
|
||||||
* the repacketizer since the last call to
|
|
||||||
* opus_repacketizer_init() or
|
|
||||||
* opus_repacketizer_create() is also
|
|
||||||
* sufficient, and possibly much smaller.
|
|
||||||
* @returns The total size of the output packet on success, or an error code
|
|
||||||
* on failure.
|
|
||||||
* @retval #OPUS_BAD_ARG <code>[begin,end)</code> was an invalid range of
|
|
||||||
* frames (begin < 0, begin >= end, or end >
|
|
||||||
* opus_repacketizer_get_nb_frames()).
|
|
||||||
* @retval #OPUS_BUFFER_TOO_SMALL \a maxlen was insufficient to contain the
|
|
||||||
* complete output packet.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_repacketizer_out_range(OpusRepacketizer *rp, int begin, int end, unsigned char *data, opus_int32 maxlen) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
|
|
||||||
|
|
||||||
/** Return the total number of frames contained in packet data submitted to
|
|
||||||
* the repacketizer state so far via opus_repacketizer_cat() since the last
|
|
||||||
* call to opus_repacketizer_init() or opus_repacketizer_create().
|
|
||||||
* This defines the valid range of packets that can be extracted with
|
|
||||||
* opus_repacketizer_out_range() or opus_repacketizer_out().
|
|
||||||
* @param rp <tt>OpusRepacketizer*</tt>: The repacketizer state containing the
|
|
||||||
* frames.
|
|
||||||
* @returns The total number of frames contained in the packet data submitted
|
|
||||||
* to the repacketizer state.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_repacketizer_get_nb_frames(OpusRepacketizer *rp) OPUS_ARG_NONNULL(1);
|
|
||||||
|
|
||||||
/** Construct a new packet from data previously submitted to the repacketizer
|
|
||||||
* state via opus_repacketizer_cat().
|
|
||||||
* This is a convenience routine that returns all the data submitted so far
|
|
||||||
* in a single packet.
|
|
||||||
* It is equivalent to calling
|
|
||||||
* @code
|
|
||||||
* opus_repacketizer_out_range(rp, 0, opus_repacketizer_get_nb_frames(rp),
|
|
||||||
* data, maxlen)
|
|
||||||
* @endcode
|
|
||||||
* @param rp <tt>OpusRepacketizer*</tt>: The repacketizer state from which to
|
|
||||||
* construct the new packet.
|
|
||||||
* @param[out] data <tt>const unsigned char*</tt>: The buffer in which to
|
|
||||||
* store the output packet.
|
|
||||||
* @param maxlen <tt>opus_int32</tt>: The maximum number of bytes to store in
|
|
||||||
* the output buffer. In order to guarantee
|
|
||||||
* success, this should be at least
|
|
||||||
* <code>1277*opus_repacketizer_get_nb_frames(rp)</code>.
|
|
||||||
* However,
|
|
||||||
* <code>1*opus_repacketizer_get_nb_frames(rp)</code>
|
|
||||||
* plus the size of all packet data
|
|
||||||
* submitted to the repacketizer since the
|
|
||||||
* last call to opus_repacketizer_init() or
|
|
||||||
* opus_repacketizer_create() is also
|
|
||||||
* sufficient, and possibly much smaller.
|
|
||||||
* @returns The total size of the output packet on success, or an error code
|
|
||||||
* on failure.
|
|
||||||
* @retval #OPUS_BUFFER_TOO_SMALL \a maxlen was insufficient to contain the
|
|
||||||
* complete output packet.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_repacketizer_out(OpusRepacketizer *rp, unsigned char *data, opus_int32 maxlen) OPUS_ARG_NONNULL(1);
|
|
||||||
|
|
||||||
/** Pads a given Opus packet to a larger size (possibly changing the TOC sequence).
|
|
||||||
* @param[in,out] data <tt>const unsigned char*</tt>: The buffer containing the
|
|
||||||
* packet to pad.
|
|
||||||
* @param len <tt>opus_int32</tt>: The size of the packet.
|
|
||||||
* This must be at least 1.
|
|
||||||
* @param new_len <tt>opus_int32</tt>: The desired size of the packet after padding.
|
|
||||||
* This must be at least as large as len.
|
|
||||||
* @returns an error code
|
|
||||||
* @retval #OPUS_OK \a on success.
|
|
||||||
* @retval #OPUS_BAD_ARG \a len was less than 1 or new_len was less than len.
|
|
||||||
* @retval #OPUS_INVALID_PACKET \a data did not contain a valid Opus packet.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT int opus_packet_pad(unsigned char *data, opus_int32 len, opus_int32 new_len);
|
|
||||||
|
|
||||||
/** Remove all padding from a given Opus packet and rewrite the TOC sequence to
|
|
||||||
* minimize space usage.
|
|
||||||
* @param[in,out] data <tt>const unsigned char*</tt>: The buffer containing the
|
|
||||||
* packet to strip.
|
|
||||||
* @param len <tt>opus_int32</tt>: The size of the packet.
|
|
||||||
* This must be at least 1.
|
|
||||||
* @returns The new size of the output packet on success, or an error code
|
|
||||||
* on failure.
|
|
||||||
* @retval #OPUS_BAD_ARG \a len was less than 1.
|
|
||||||
* @retval #OPUS_INVALID_PACKET \a data did not contain a valid Opus packet.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_packet_unpad(unsigned char *data, opus_int32 len);
|
|
||||||
|
|
||||||
/** Pads a given Opus multi-stream packet to a larger size (possibly changing the TOC sequence).
|
|
||||||
* @param[in,out] data <tt>const unsigned char*</tt>: The buffer containing the
|
|
||||||
* packet to pad.
|
|
||||||
* @param len <tt>opus_int32</tt>: The size of the packet.
|
|
||||||
* This must be at least 1.
|
|
||||||
* @param new_len <tt>opus_int32</tt>: The desired size of the packet after padding.
|
|
||||||
* This must be at least 1.
|
|
||||||
* @param nb_streams <tt>opus_int32</tt>: The number of streams (not channels) in the packet.
|
|
||||||
* This must be at least as large as len.
|
|
||||||
* @returns an error code
|
|
||||||
* @retval #OPUS_OK \a on success.
|
|
||||||
* @retval #OPUS_BAD_ARG \a len was less than 1.
|
|
||||||
* @retval #OPUS_INVALID_PACKET \a data did not contain a valid Opus packet.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT int opus_multistream_packet_pad(unsigned char *data, opus_int32 len, opus_int32 new_len, int nb_streams);
|
|
||||||
|
|
||||||
/** Remove all padding from a given Opus multi-stream packet and rewrite the TOC sequence to
|
|
||||||
* minimize space usage.
|
|
||||||
* @param[in,out] data <tt>const unsigned char*</tt>: The buffer containing the
|
|
||||||
* packet to strip.
|
|
||||||
* @param len <tt>opus_int32</tt>: The size of the packet.
|
|
||||||
* This must be at least 1.
|
|
||||||
* @param nb_streams <tt>opus_int32</tt>: The number of streams (not channels) in the packet.
|
|
||||||
* This must be at least 1.
|
|
||||||
* @returns The new size of the output packet on success, or an error code
|
|
||||||
* on failure.
|
|
||||||
* @retval #OPUS_BAD_ARG \a len was less than 1 or new_len was less than len.
|
|
||||||
* @retval #OPUS_INVALID_PACKET \a data did not contain a valid Opus packet.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_multistream_packet_unpad(unsigned char *data, opus_int32 len, int nb_streams);
|
|
||||||
|
|
||||||
/**@}*/
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* OPUS_H */
|
|
|
@ -1,342 +0,0 @@
|
||||||
/* Copyright (c) 2007-2008 CSIRO
|
|
||||||
Copyright (c) 2007-2009 Xiph.Org Foundation
|
|
||||||
Copyright (c) 2008-2012 Gregory Maxwell
|
|
||||||
Written by Jean-Marc Valin and Gregory Maxwell */
|
|
||||||
/*
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
|
||||||
modification, are permitted provided that the following conditions
|
|
||||||
are met:
|
|
||||||
|
|
||||||
- Redistributions of source code must retain the above copyright
|
|
||||||
notice, this list of conditions and the following disclaimer.
|
|
||||||
|
|
||||||
- Redistributions in binary form must reproduce the above copyright
|
|
||||||
notice, this list of conditions and the following disclaimer in the
|
|
||||||
documentation and/or other materials provided with the distribution.
|
|
||||||
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
||||||
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
||||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
||||||
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
|
|
||||||
OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
|
||||||
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
|
||||||
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
|
||||||
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
|
||||||
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
@file opus_custom.h
|
|
||||||
@brief Opus-Custom reference implementation API
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef OPUS_CUSTOM_H
|
|
||||||
#define OPUS_CUSTOM_H
|
|
||||||
|
|
||||||
#include "opus_defines.h"
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CUSTOM_MODES
|
|
||||||
# define OPUS_CUSTOM_EXPORT OPUS_EXPORT
|
|
||||||
# define OPUS_CUSTOM_EXPORT_STATIC OPUS_EXPORT
|
|
||||||
#else
|
|
||||||
# define OPUS_CUSTOM_EXPORT
|
|
||||||
# ifdef OPUS_BUILD
|
|
||||||
# define OPUS_CUSTOM_EXPORT_STATIC static OPUS_INLINE
|
|
||||||
# else
|
|
||||||
# define OPUS_CUSTOM_EXPORT_STATIC
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/** @defgroup opus_custom Opus Custom
|
|
||||||
* @{
|
|
||||||
* Opus Custom is an optional part of the Opus specification and
|
|
||||||
* reference implementation which uses a distinct API from the regular
|
|
||||||
* API and supports frame sizes that are not normally supported.\ Use
|
|
||||||
* of Opus Custom is discouraged for all but very special applications
|
|
||||||
* for which a frame size different from 2.5, 5, 10, or 20 ms is needed
|
|
||||||
* (for either complexity or latency reasons) and where interoperability
|
|
||||||
* is less important.
|
|
||||||
*
|
|
||||||
* In addition to the interoperability limitations the use of Opus custom
|
|
||||||
* disables a substantial chunk of the codec and generally lowers the
|
|
||||||
* quality available at a given bitrate. Normally when an application needs
|
|
||||||
* a different frame size from the codec it should buffer to match the
|
|
||||||
* sizes but this adds a small amount of delay which may be important
|
|
||||||
* in some very low latency applications. Some transports (especially
|
|
||||||
* constant rate RF transports) may also work best with frames of
|
|
||||||
* particular durations.
|
|
||||||
*
|
|
||||||
* Libopus only supports custom modes if they are enabled at compile time.
|
|
||||||
*
|
|
||||||
* The Opus Custom API is similar to the regular API but the
|
|
||||||
* @ref opus_encoder_create and @ref opus_decoder_create calls take
|
|
||||||
* an additional mode parameter which is a structure produced by
|
|
||||||
* a call to @ref opus_custom_mode_create. Both the encoder and decoder
|
|
||||||
* must create a mode using the same sample rate (fs) and frame size
|
|
||||||
* (frame size) so these parameters must either be signaled out of band
|
|
||||||
* or fixed in a particular implementation.
|
|
||||||
*
|
|
||||||
* Similar to regular Opus the custom modes support on the fly frame size
|
|
||||||
* switching, but the sizes available depend on the particular frame size in
|
|
||||||
* use. For some initial frame sizes on a single on the fly size is available.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/** Contains the state of an encoder. One encoder state is needed
|
|
||||||
for each stream. It is initialized once at the beginning of the
|
|
||||||
stream. Do *not* re-initialize the state for every frame.
|
|
||||||
@brief Encoder state
|
|
||||||
*/
|
|
||||||
typedef struct OpusCustomEncoder OpusCustomEncoder;
|
|
||||||
|
|
||||||
/** State of the decoder. One decoder state is needed for each stream.
|
|
||||||
It is initialized once at the beginning of the stream. Do *not*
|
|
||||||
re-initialize the state for every frame.
|
|
||||||
@brief Decoder state
|
|
||||||
*/
|
|
||||||
typedef struct OpusCustomDecoder OpusCustomDecoder;
|
|
||||||
|
|
||||||
/** The mode contains all the information necessary to create an
|
|
||||||
encoder. Both the encoder and decoder need to be initialized
|
|
||||||
with exactly the same mode, otherwise the output will be
|
|
||||||
corrupted.
|
|
||||||
@brief Mode configuration
|
|
||||||
*/
|
|
||||||
typedef struct OpusCustomMode OpusCustomMode;
|
|
||||||
|
|
||||||
/** Creates a new mode struct. This will be passed to an encoder or
|
|
||||||
* decoder. The mode MUST NOT BE DESTROYED until the encoders and
|
|
||||||
* decoders that use it are destroyed as well.
|
|
||||||
* @param [in] Fs <tt>int</tt>: Sampling rate (8000 to 96000 Hz)
|
|
||||||
* @param [in] frame_size <tt>int</tt>: Number of samples (per channel) to encode in each
|
|
||||||
* packet (64 - 1024, prime factorization must contain zero or more 2s, 3s, or 5s and no other primes)
|
|
||||||
* @param [out] error <tt>int*</tt>: Returned error code (if NULL, no error will be returned)
|
|
||||||
* @return A newly created mode
|
|
||||||
*/
|
|
||||||
OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT OpusCustomMode *opus_custom_mode_create(opus_int32 Fs, int frame_size, int *error);
|
|
||||||
|
|
||||||
/** Destroys a mode struct. Only call this after all encoders and
|
|
||||||
* decoders using this mode are destroyed as well.
|
|
||||||
* @param [in] mode <tt>OpusCustomMode*</tt>: Mode to be freed.
|
|
||||||
*/
|
|
||||||
OPUS_CUSTOM_EXPORT void opus_custom_mode_destroy(OpusCustomMode *mode);
|
|
||||||
|
|
||||||
|
|
||||||
#if !defined(OPUS_BUILD) || defined(CELT_ENCODER_C)
|
|
||||||
|
|
||||||
/* Encoder */
|
|
||||||
/** Gets the size of an OpusCustomEncoder structure.
|
|
||||||
* @param [in] mode <tt>OpusCustomMode *</tt>: Mode configuration
|
|
||||||
* @param [in] channels <tt>int</tt>: Number of channels
|
|
||||||
* @returns size
|
|
||||||
*/
|
|
||||||
OPUS_CUSTOM_EXPORT_STATIC OPUS_WARN_UNUSED_RESULT int opus_custom_encoder_get_size(
|
|
||||||
const OpusCustomMode *mode,
|
|
||||||
int channels
|
|
||||||
) OPUS_ARG_NONNULL(1);
|
|
||||||
|
|
||||||
# ifdef CUSTOM_MODES
|
|
||||||
/** Initializes a previously allocated encoder state
|
|
||||||
* The memory pointed to by st must be the size returned by opus_custom_encoder_get_size.
|
|
||||||
* This is intended for applications which use their own allocator instead of malloc.
|
|
||||||
* @see opus_custom_encoder_create(),opus_custom_encoder_get_size()
|
|
||||||
* To reset a previously initialized state use the OPUS_RESET_STATE CTL.
|
|
||||||
* @param [in] st <tt>OpusCustomEncoder*</tt>: Encoder state
|
|
||||||
* @param [in] mode <tt>OpusCustomMode *</tt>: Contains all the information about the characteristics of
|
|
||||||
* the stream (must be the same characteristics as used for the
|
|
||||||
* decoder)
|
|
||||||
* @param [in] channels <tt>int</tt>: Number of channels
|
|
||||||
* @return OPUS_OK Success or @ref opus_errorcodes
|
|
||||||
*/
|
|
||||||
OPUS_CUSTOM_EXPORT int opus_custom_encoder_init(
|
|
||||||
OpusCustomEncoder *st,
|
|
||||||
const OpusCustomMode *mode,
|
|
||||||
int channels
|
|
||||||
) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2);
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/** Creates a new encoder state. Each stream needs its own encoder
|
|
||||||
* state (can't be shared across simultaneous streams).
|
|
||||||
* @param [in] mode <tt>OpusCustomMode*</tt>: Contains all the information about the characteristics of
|
|
||||||
* the stream (must be the same characteristics as used for the
|
|
||||||
* decoder)
|
|
||||||
* @param [in] channels <tt>int</tt>: Number of channels
|
|
||||||
* @param [out] error <tt>int*</tt>: Returns an error code
|
|
||||||
* @return Newly created encoder state.
|
|
||||||
*/
|
|
||||||
OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT OpusCustomEncoder *opus_custom_encoder_create(
|
|
||||||
const OpusCustomMode *mode,
|
|
||||||
int channels,
|
|
||||||
int *error
|
|
||||||
) OPUS_ARG_NONNULL(1);
|
|
||||||
|
|
||||||
|
|
||||||
/** Destroys a an encoder state.
|
|
||||||
* @param[in] st <tt>OpusCustomEncoder*</tt>: State to be freed.
|
|
||||||
*/
|
|
||||||
OPUS_CUSTOM_EXPORT void opus_custom_encoder_destroy(OpusCustomEncoder *st);
|
|
||||||
|
|
||||||
/** Encodes a frame of audio.
|
|
||||||
* @param [in] st <tt>OpusCustomEncoder*</tt>: Encoder state
|
|
||||||
* @param [in] pcm <tt>float*</tt>: PCM audio in float format, with a normal range of +/-1.0.
|
|
||||||
* Samples with a range beyond +/-1.0 are supported but will
|
|
||||||
* be clipped by decoders using the integer API and should
|
|
||||||
* only be used if it is known that the far end supports
|
|
||||||
* extended dynamic range. There must be exactly
|
|
||||||
* frame_size samples per channel.
|
|
||||||
* @param [in] frame_size <tt>int</tt>: Number of samples per frame of input signal
|
|
||||||
* @param [out] compressed <tt>char *</tt>: The compressed data is written here. This may not alias pcm and must be at least maxCompressedBytes long.
|
|
||||||
* @param [in] maxCompressedBytes <tt>int</tt>: Maximum number of bytes to use for compressing the frame
|
|
||||||
* (can change from one frame to another)
|
|
||||||
* @return Number of bytes written to "compressed".
|
|
||||||
* If negative, an error has occurred (see error codes). It is IMPORTANT that
|
|
||||||
* the length returned be somehow transmitted to the decoder. Otherwise, no
|
|
||||||
* decoding is possible.
|
|
||||||
*/
|
|
||||||
OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT int opus_custom_encode_float(
|
|
||||||
OpusCustomEncoder *st,
|
|
||||||
const float *pcm,
|
|
||||||
int frame_size,
|
|
||||||
unsigned char *compressed,
|
|
||||||
int maxCompressedBytes
|
|
||||||
) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
|
|
||||||
|
|
||||||
/** Encodes a frame of audio.
|
|
||||||
* @param [in] st <tt>OpusCustomEncoder*</tt>: Encoder state
|
|
||||||
* @param [in] pcm <tt>opus_int16*</tt>: PCM audio in signed 16-bit format (native endian).
|
|
||||||
* There must be exactly frame_size samples per channel.
|
|
||||||
* @param [in] frame_size <tt>int</tt>: Number of samples per frame of input signal
|
|
||||||
* @param [out] compressed <tt>char *</tt>: The compressed data is written here. This may not alias pcm and must be at least maxCompressedBytes long.
|
|
||||||
* @param [in] maxCompressedBytes <tt>int</tt>: Maximum number of bytes to use for compressing the frame
|
|
||||||
* (can change from one frame to another)
|
|
||||||
* @return Number of bytes written to "compressed".
|
|
||||||
* If negative, an error has occurred (see error codes). It is IMPORTANT that
|
|
||||||
* the length returned be somehow transmitted to the decoder. Otherwise, no
|
|
||||||
* decoding is possible.
|
|
||||||
*/
|
|
||||||
OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT int opus_custom_encode(
|
|
||||||
OpusCustomEncoder *st,
|
|
||||||
const opus_int16 *pcm,
|
|
||||||
int frame_size,
|
|
||||||
unsigned char *compressed,
|
|
||||||
int maxCompressedBytes
|
|
||||||
) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
|
|
||||||
|
|
||||||
/** Perform a CTL function on an Opus custom encoder.
|
|
||||||
*
|
|
||||||
* Generally the request and subsequent arguments are generated
|
|
||||||
* by a convenience macro.
|
|
||||||
* @see opus_encoderctls
|
|
||||||
*/
|
|
||||||
OPUS_CUSTOM_EXPORT int opus_custom_encoder_ctl(OpusCustomEncoder * OPUS_RESTRICT st, int request, ...) OPUS_ARG_NONNULL(1);
|
|
||||||
|
|
||||||
|
|
||||||
#if !defined(OPUS_BUILD) || defined(CELT_DECODER_C)
|
|
||||||
/* Decoder */
|
|
||||||
|
|
||||||
/** Gets the size of an OpusCustomDecoder structure.
|
|
||||||
* @param [in] mode <tt>OpusCustomMode *</tt>: Mode configuration
|
|
||||||
* @param [in] channels <tt>int</tt>: Number of channels
|
|
||||||
* @returns size
|
|
||||||
*/
|
|
||||||
OPUS_CUSTOM_EXPORT_STATIC OPUS_WARN_UNUSED_RESULT int opus_custom_decoder_get_size(
|
|
||||||
const OpusCustomMode *mode,
|
|
||||||
int channels
|
|
||||||
) OPUS_ARG_NONNULL(1);
|
|
||||||
|
|
||||||
/** Initializes a previously allocated decoder state
|
|
||||||
* The memory pointed to by st must be the size returned by opus_custom_decoder_get_size.
|
|
||||||
* This is intended for applications which use their own allocator instead of malloc.
|
|
||||||
* @see opus_custom_decoder_create(),opus_custom_decoder_get_size()
|
|
||||||
* To reset a previously initialized state use the OPUS_RESET_STATE CTL.
|
|
||||||
* @param [in] st <tt>OpusCustomDecoder*</tt>: Decoder state
|
|
||||||
* @param [in] mode <tt>OpusCustomMode *</tt>: Contains all the information about the characteristics of
|
|
||||||
* the stream (must be the same characteristics as used for the
|
|
||||||
* encoder)
|
|
||||||
* @param [in] channels <tt>int</tt>: Number of channels
|
|
||||||
* @return OPUS_OK Success or @ref opus_errorcodes
|
|
||||||
*/
|
|
||||||
OPUS_CUSTOM_EXPORT_STATIC int opus_custom_decoder_init(
|
|
||||||
OpusCustomDecoder *st,
|
|
||||||
const OpusCustomMode *mode,
|
|
||||||
int channels
|
|
||||||
) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2);
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/** Creates a new decoder state. Each stream needs its own decoder state (can't
|
|
||||||
* be shared across simultaneous streams).
|
|
||||||
* @param [in] mode <tt>OpusCustomMode</tt>: Contains all the information about the characteristics of the
|
|
||||||
* stream (must be the same characteristics as used for the encoder)
|
|
||||||
* @param [in] channels <tt>int</tt>: Number of channels
|
|
||||||
* @param [out] error <tt>int*</tt>: Returns an error code
|
|
||||||
* @return Newly created decoder state.
|
|
||||||
*/
|
|
||||||
OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT OpusCustomDecoder *opus_custom_decoder_create(
|
|
||||||
const OpusCustomMode *mode,
|
|
||||||
int channels,
|
|
||||||
int *error
|
|
||||||
) OPUS_ARG_NONNULL(1);
|
|
||||||
|
|
||||||
/** Destroys a an decoder state.
|
|
||||||
* @param[in] st <tt>OpusCustomDecoder*</tt>: State to be freed.
|
|
||||||
*/
|
|
||||||
OPUS_CUSTOM_EXPORT void opus_custom_decoder_destroy(OpusCustomDecoder *st);
|
|
||||||
|
|
||||||
/** Decode an opus custom frame with floating point output
|
|
||||||
* @param [in] st <tt>OpusCustomDecoder*</tt>: Decoder state
|
|
||||||
* @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
|
|
||||||
* @param [in] len <tt>int</tt>: Number of bytes in payload
|
|
||||||
* @param [out] pcm <tt>float*</tt>: Output signal (interleaved if 2 channels). length
|
|
||||||
* is frame_size*channels*sizeof(float)
|
|
||||||
* @param [in] frame_size Number of samples per channel of available space in *pcm.
|
|
||||||
* @returns Number of decoded samples or @ref opus_errorcodes
|
|
||||||
*/
|
|
||||||
OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT int opus_custom_decode_float(
|
|
||||||
OpusCustomDecoder *st,
|
|
||||||
const unsigned char *data,
|
|
||||||
int len,
|
|
||||||
float *pcm,
|
|
||||||
int frame_size
|
|
||||||
) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
|
|
||||||
|
|
||||||
/** Decode an opus custom frame
|
|
||||||
* @param [in] st <tt>OpusCustomDecoder*</tt>: Decoder state
|
|
||||||
* @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
|
|
||||||
* @param [in] len <tt>int</tt>: Number of bytes in payload
|
|
||||||
* @param [out] pcm <tt>opus_int16*</tt>: Output signal (interleaved if 2 channels). length
|
|
||||||
* is frame_size*channels*sizeof(opus_int16)
|
|
||||||
* @param [in] frame_size Number of samples per channel of available space in *pcm.
|
|
||||||
* @returns Number of decoded samples or @ref opus_errorcodes
|
|
||||||
*/
|
|
||||||
OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT int opus_custom_decode(
|
|
||||||
OpusCustomDecoder *st,
|
|
||||||
const unsigned char *data,
|
|
||||||
int len,
|
|
||||||
opus_int16 *pcm,
|
|
||||||
int frame_size
|
|
||||||
) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
|
|
||||||
|
|
||||||
/** Perform a CTL function on an Opus custom decoder.
|
|
||||||
*
|
|
||||||
* Generally the request and subsequent arguments are generated
|
|
||||||
* by a convenience macro.
|
|
||||||
* @see opus_genericctls
|
|
||||||
*/
|
|
||||||
OPUS_CUSTOM_EXPORT int opus_custom_decoder_ctl(OpusCustomDecoder * OPUS_RESTRICT st, int request, ...) OPUS_ARG_NONNULL(1);
|
|
||||||
|
|
||||||
/**@}*/
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* OPUS_CUSTOM_H */
|
|
|
@ -1,788 +0,0 @@
|
||||||
/* Copyright (c) 2010-2011 Xiph.Org Foundation, Skype Limited
|
|
||||||
Written by Jean-Marc Valin and Koen Vos */
|
|
||||||
/*
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
|
||||||
modification, are permitted provided that the following conditions
|
|
||||||
are met:
|
|
||||||
|
|
||||||
- Redistributions of source code must retain the above copyright
|
|
||||||
notice, this list of conditions and the following disclaimer.
|
|
||||||
|
|
||||||
- Redistributions in binary form must reproduce the above copyright
|
|
||||||
notice, this list of conditions and the following disclaimer in the
|
|
||||||
documentation and/or other materials provided with the distribution.
|
|
||||||
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
||||||
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
||||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
||||||
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
|
|
||||||
OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
|
||||||
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
|
||||||
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
|
||||||
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
|
||||||
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @file opus_defines.h
|
|
||||||
* @brief Opus reference implementation constants
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef OPUS_DEFINES_H
|
|
||||||
#define OPUS_DEFINES_H
|
|
||||||
|
|
||||||
#include "opus_types.h"
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/** @defgroup opus_errorcodes Error codes
|
|
||||||
* @{
|
|
||||||
*/
|
|
||||||
/** No error @hideinitializer*/
|
|
||||||
#define OPUS_OK 0
|
|
||||||
/** One or more invalid/out of range arguments @hideinitializer*/
|
|
||||||
#define OPUS_BAD_ARG -1
|
|
||||||
/** Not enough bytes allocated in the buffer @hideinitializer*/
|
|
||||||
#define OPUS_BUFFER_TOO_SMALL -2
|
|
||||||
/** An internal error was detected @hideinitializer*/
|
|
||||||
#define OPUS_INTERNAL_ERROR -3
|
|
||||||
/** The compressed data passed is corrupted @hideinitializer*/
|
|
||||||
#define OPUS_INVALID_PACKET -4
|
|
||||||
/** Invalid/unsupported request number @hideinitializer*/
|
|
||||||
#define OPUS_UNIMPLEMENTED -5
|
|
||||||
/** An encoder or decoder structure is invalid or already freed @hideinitializer*/
|
|
||||||
#define OPUS_INVALID_STATE -6
|
|
||||||
/** Memory allocation has failed @hideinitializer*/
|
|
||||||
#define OPUS_ALLOC_FAIL -7
|
|
||||||
/**@}*/
|
|
||||||
|
|
||||||
/** @cond OPUS_INTERNAL_DOC */
|
|
||||||
/**Export control for opus functions */
|
|
||||||
|
|
||||||
#ifndef OPUS_EXPORT
|
|
||||||
# if defined(WIN32)
|
|
||||||
# if defined(OPUS_BUILD) && defined(DLL_EXPORT)
|
|
||||||
# define OPUS_EXPORT __declspec(dllexport)
|
|
||||||
# else
|
|
||||||
# define OPUS_EXPORT
|
|
||||||
# endif
|
|
||||||
# elif defined(__GNUC__) && defined(OPUS_BUILD)
|
|
||||||
# define OPUS_EXPORT __attribute__ ((visibility ("default")))
|
|
||||||
# else
|
|
||||||
# define OPUS_EXPORT
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
# if !defined(OPUS_GNUC_PREREQ)
|
|
||||||
# if defined(__GNUC__)&&defined(__GNUC_MINOR__)
|
|
||||||
# define OPUS_GNUC_PREREQ(_maj,_min) \
|
|
||||||
((__GNUC__<<16)+__GNUC_MINOR__>=((_maj)<<16)+(_min))
|
|
||||||
# else
|
|
||||||
# define OPUS_GNUC_PREREQ(_maj,_min) 0
|
|
||||||
# endif
|
|
||||||
# endif
|
|
||||||
|
|
||||||
#if (!defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L) )
|
|
||||||
# if OPUS_GNUC_PREREQ(3,0)
|
|
||||||
# define OPUS_RESTRICT __restrict__
|
|
||||||
# elif (defined(_MSC_VER) && _MSC_VER >= 1400)
|
|
||||||
# define OPUS_RESTRICT __restrict
|
|
||||||
# else
|
|
||||||
# define OPUS_RESTRICT
|
|
||||||
# endif
|
|
||||||
#else
|
|
||||||
# define OPUS_RESTRICT restrict
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if (!defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L) )
|
|
||||||
# if OPUS_GNUC_PREREQ(2,7)
|
|
||||||
# define OPUS_INLINE __inline__
|
|
||||||
# elif (defined(_MSC_VER))
|
|
||||||
# define OPUS_INLINE __inline
|
|
||||||
# else
|
|
||||||
# define OPUS_INLINE
|
|
||||||
# endif
|
|
||||||
#else
|
|
||||||
# define OPUS_INLINE inline
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**Warning attributes for opus functions
|
|
||||||
* NONNULL is not used in OPUS_BUILD to avoid the compiler optimizing out
|
|
||||||
* some paranoid null checks. */
|
|
||||||
#if defined(__GNUC__) && OPUS_GNUC_PREREQ(3, 4)
|
|
||||||
# define OPUS_WARN_UNUSED_RESULT __attribute__ ((__warn_unused_result__))
|
|
||||||
#else
|
|
||||||
# define OPUS_WARN_UNUSED_RESULT
|
|
||||||
#endif
|
|
||||||
#if !defined(OPUS_BUILD) && defined(__GNUC__) && OPUS_GNUC_PREREQ(3, 4)
|
|
||||||
# define OPUS_ARG_NONNULL(_x) __attribute__ ((__nonnull__(_x)))
|
|
||||||
#else
|
|
||||||
# define OPUS_ARG_NONNULL(_x)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/** These are the actual Encoder CTL ID numbers.
|
|
||||||
* They should not be used directly by applications.
|
|
||||||
* In general, SETs should be even and GETs should be odd.*/
|
|
||||||
#define OPUS_SET_APPLICATION_REQUEST 4000
|
|
||||||
#define OPUS_GET_APPLICATION_REQUEST 4001
|
|
||||||
#define OPUS_SET_BITRATE_REQUEST 4002
|
|
||||||
#define OPUS_GET_BITRATE_REQUEST 4003
|
|
||||||
#define OPUS_SET_MAX_BANDWIDTH_REQUEST 4004
|
|
||||||
#define OPUS_GET_MAX_BANDWIDTH_REQUEST 4005
|
|
||||||
#define OPUS_SET_VBR_REQUEST 4006
|
|
||||||
#define OPUS_GET_VBR_REQUEST 4007
|
|
||||||
#define OPUS_SET_BANDWIDTH_REQUEST 4008
|
|
||||||
#define OPUS_GET_BANDWIDTH_REQUEST 4009
|
|
||||||
#define OPUS_SET_COMPLEXITY_REQUEST 4010
|
|
||||||
#define OPUS_GET_COMPLEXITY_REQUEST 4011
|
|
||||||
#define OPUS_SET_INBAND_FEC_REQUEST 4012
|
|
||||||
#define OPUS_GET_INBAND_FEC_REQUEST 4013
|
|
||||||
#define OPUS_SET_PACKET_LOSS_PERC_REQUEST 4014
|
|
||||||
#define OPUS_GET_PACKET_LOSS_PERC_REQUEST 4015
|
|
||||||
#define OPUS_SET_DTX_REQUEST 4016
|
|
||||||
#define OPUS_GET_DTX_REQUEST 4017
|
|
||||||
#define OPUS_SET_VBR_CONSTRAINT_REQUEST 4020
|
|
||||||
#define OPUS_GET_VBR_CONSTRAINT_REQUEST 4021
|
|
||||||
#define OPUS_SET_FORCE_CHANNELS_REQUEST 4022
|
|
||||||
#define OPUS_GET_FORCE_CHANNELS_REQUEST 4023
|
|
||||||
#define OPUS_SET_SIGNAL_REQUEST 4024
|
|
||||||
#define OPUS_GET_SIGNAL_REQUEST 4025
|
|
||||||
#define OPUS_GET_LOOKAHEAD_REQUEST 4027
|
|
||||||
/* #define OPUS_RESET_STATE 4028 */
|
|
||||||
#define OPUS_GET_SAMPLE_RATE_REQUEST 4029
|
|
||||||
#define OPUS_GET_FINAL_RANGE_REQUEST 4031
|
|
||||||
#define OPUS_GET_PITCH_REQUEST 4033
|
|
||||||
#define OPUS_SET_GAIN_REQUEST 4034
|
|
||||||
#define OPUS_GET_GAIN_REQUEST 4045 /* Should have been 4035 */
|
|
||||||
#define OPUS_SET_LSB_DEPTH_REQUEST 4036
|
|
||||||
#define OPUS_GET_LSB_DEPTH_REQUEST 4037
|
|
||||||
#define OPUS_GET_LAST_PACKET_DURATION_REQUEST 4039
|
|
||||||
#define OPUS_SET_EXPERT_FRAME_DURATION_REQUEST 4040
|
|
||||||
#define OPUS_GET_EXPERT_FRAME_DURATION_REQUEST 4041
|
|
||||||
#define OPUS_SET_PREDICTION_DISABLED_REQUEST 4042
|
|
||||||
#define OPUS_GET_PREDICTION_DISABLED_REQUEST 4043
|
|
||||||
/* Don't use 4045, it's already taken by OPUS_GET_GAIN_REQUEST */
|
|
||||||
#define OPUS_SET_PHASE_INVERSION_DISABLED_REQUEST 4046
|
|
||||||
#define OPUS_GET_PHASE_INVERSION_DISABLED_REQUEST 4047
|
|
||||||
|
|
||||||
/** Defines for the presence of extended APIs. */
|
|
||||||
#define OPUS_HAVE_OPUS_PROJECTION_H
|
|
||||||
|
|
||||||
/* Macros to trigger compilation errors when the wrong types are provided to a CTL */
|
|
||||||
#define __opus_check_int(x) (((void)((x) == (opus_int32)0)), (opus_int32)(x))
|
|
||||||
#define __opus_check_int_ptr(ptr) ((ptr) + ((ptr) - (opus_int32*)(ptr)))
|
|
||||||
#define __opus_check_uint_ptr(ptr) ((ptr) + ((ptr) - (opus_uint32*)(ptr)))
|
|
||||||
#define __opus_check_val16_ptr(ptr) ((ptr) + ((ptr) - (opus_val16*)(ptr)))
|
|
||||||
/** @endcond */
|
|
||||||
|
|
||||||
/** @defgroup opus_ctlvalues Pre-defined values for CTL interface
|
|
||||||
* @see opus_genericctls, opus_encoderctls
|
|
||||||
* @{
|
|
||||||
*/
|
|
||||||
/* Values for the various encoder CTLs */
|
|
||||||
#define OPUS_AUTO -1000 /**<Auto/default setting @hideinitializer*/
|
|
||||||
#define OPUS_BITRATE_MAX -1 /**<Maximum bitrate @hideinitializer*/
|
|
||||||
|
|
||||||
/** Best for most VoIP/videoconference applications where listening quality and intelligibility matter most
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_APPLICATION_VOIP 2048
|
|
||||||
/** Best for broadcast/high-fidelity application where the decoded audio should be as close as possible to the input
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_APPLICATION_AUDIO 2049
|
|
||||||
/** Only use when lowest-achievable latency is what matters most. Voice-optimized modes cannot be used.
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_APPLICATION_RESTRICTED_LOWDELAY 2051
|
|
||||||
|
|
||||||
#define OPUS_SIGNAL_VOICE 3001 /**< Signal being encoded is voice */
|
|
||||||
#define OPUS_SIGNAL_MUSIC 3002 /**< Signal being encoded is music */
|
|
||||||
#define OPUS_BANDWIDTH_NARROWBAND 1101 /**< 4 kHz bandpass @hideinitializer*/
|
|
||||||
#define OPUS_BANDWIDTH_MEDIUMBAND 1102 /**< 6 kHz bandpass @hideinitializer*/
|
|
||||||
#define OPUS_BANDWIDTH_WIDEBAND 1103 /**< 8 kHz bandpass @hideinitializer*/
|
|
||||||
#define OPUS_BANDWIDTH_SUPERWIDEBAND 1104 /**<12 kHz bandpass @hideinitializer*/
|
|
||||||
#define OPUS_BANDWIDTH_FULLBAND 1105 /**<20 kHz bandpass @hideinitializer*/
|
|
||||||
|
|
||||||
#define OPUS_FRAMESIZE_ARG 5000 /**< Select frame size from the argument (default) */
|
|
||||||
#define OPUS_FRAMESIZE_2_5_MS 5001 /**< Use 2.5 ms frames */
|
|
||||||
#define OPUS_FRAMESIZE_5_MS 5002 /**< Use 5 ms frames */
|
|
||||||
#define OPUS_FRAMESIZE_10_MS 5003 /**< Use 10 ms frames */
|
|
||||||
#define OPUS_FRAMESIZE_20_MS 5004 /**< Use 20 ms frames */
|
|
||||||
#define OPUS_FRAMESIZE_40_MS 5005 /**< Use 40 ms frames */
|
|
||||||
#define OPUS_FRAMESIZE_60_MS 5006 /**< Use 60 ms frames */
|
|
||||||
#define OPUS_FRAMESIZE_80_MS 5007 /**< Use 80 ms frames */
|
|
||||||
#define OPUS_FRAMESIZE_100_MS 5008 /**< Use 100 ms frames */
|
|
||||||
#define OPUS_FRAMESIZE_120_MS 5009 /**< Use 120 ms frames */
|
|
||||||
|
|
||||||
/**@}*/
|
|
||||||
|
|
||||||
|
|
||||||
/** @defgroup opus_encoderctls Encoder related CTLs
|
|
||||||
*
|
|
||||||
* These are convenience macros for use with the \c opus_encode_ctl
|
|
||||||
* interface. They are used to generate the appropriate series of
|
|
||||||
* arguments for that call, passing the correct type, size and so
|
|
||||||
* on as expected for each particular request.
|
|
||||||
*
|
|
||||||
* Some usage examples:
|
|
||||||
*
|
|
||||||
* @code
|
|
||||||
* int ret;
|
|
||||||
* ret = opus_encoder_ctl(enc_ctx, OPUS_SET_BANDWIDTH(OPUS_AUTO));
|
|
||||||
* if (ret != OPUS_OK) return ret;
|
|
||||||
*
|
|
||||||
* opus_int32 rate;
|
|
||||||
* opus_encoder_ctl(enc_ctx, OPUS_GET_BANDWIDTH(&rate));
|
|
||||||
*
|
|
||||||
* opus_encoder_ctl(enc_ctx, OPUS_RESET_STATE);
|
|
||||||
* @endcode
|
|
||||||
*
|
|
||||||
* @see opus_genericctls, opus_encoder
|
|
||||||
* @{
|
|
||||||
*/
|
|
||||||
|
|
||||||
/** Configures the encoder's computational complexity.
|
|
||||||
* The supported range is 0-10 inclusive with 10 representing the highest complexity.
|
|
||||||
* @see OPUS_GET_COMPLEXITY
|
|
||||||
* @param[in] x <tt>opus_int32</tt>: Allowed values: 0-10, inclusive.
|
|
||||||
*
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_SET_COMPLEXITY(x) OPUS_SET_COMPLEXITY_REQUEST, __opus_check_int(x)
|
|
||||||
/** Gets the encoder's complexity configuration.
|
|
||||||
* @see OPUS_SET_COMPLEXITY
|
|
||||||
* @param[out] x <tt>opus_int32 *</tt>: Returns a value in the range 0-10,
|
|
||||||
* inclusive.
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_GET_COMPLEXITY(x) OPUS_GET_COMPLEXITY_REQUEST, __opus_check_int_ptr(x)
|
|
||||||
|
|
||||||
/** Configures the bitrate in the encoder.
|
|
||||||
* Rates from 500 to 512000 bits per second are meaningful, as well as the
|
|
||||||
* special values #OPUS_AUTO and #OPUS_BITRATE_MAX.
|
|
||||||
* The value #OPUS_BITRATE_MAX can be used to cause the codec to use as much
|
|
||||||
* rate as it can, which is useful for controlling the rate by adjusting the
|
|
||||||
* output buffer size.
|
|
||||||
* @see OPUS_GET_BITRATE
|
|
||||||
* @param[in] x <tt>opus_int32</tt>: Bitrate in bits per second. The default
|
|
||||||
* is determined based on the number of
|
|
||||||
* channels and the input sampling rate.
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_SET_BITRATE(x) OPUS_SET_BITRATE_REQUEST, __opus_check_int(x)
|
|
||||||
/** Gets the encoder's bitrate configuration.
|
|
||||||
* @see OPUS_SET_BITRATE
|
|
||||||
* @param[out] x <tt>opus_int32 *</tt>: Returns the bitrate in bits per second.
|
|
||||||
* The default is determined based on the
|
|
||||||
* number of channels and the input
|
|
||||||
* sampling rate.
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_GET_BITRATE(x) OPUS_GET_BITRATE_REQUEST, __opus_check_int_ptr(x)
|
|
||||||
|
|
||||||
/** Enables or disables variable bitrate (VBR) in the encoder.
|
|
||||||
* The configured bitrate may not be met exactly because frames must
|
|
||||||
* be an integer number of bytes in length.
|
|
||||||
* @see OPUS_GET_VBR
|
|
||||||
* @see OPUS_SET_VBR_CONSTRAINT
|
|
||||||
* @param[in] x <tt>opus_int32</tt>: Allowed values:
|
|
||||||
* <dl>
|
|
||||||
* <dt>0</dt><dd>Hard CBR. For LPC/hybrid modes at very low bit-rate, this can
|
|
||||||
* cause noticeable quality degradation.</dd>
|
|
||||||
* <dt>1</dt><dd>VBR (default). The exact type of VBR is controlled by
|
|
||||||
* #OPUS_SET_VBR_CONSTRAINT.</dd>
|
|
||||||
* </dl>
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_SET_VBR(x) OPUS_SET_VBR_REQUEST, __opus_check_int(x)
|
|
||||||
/** Determine if variable bitrate (VBR) is enabled in the encoder.
|
|
||||||
* @see OPUS_SET_VBR
|
|
||||||
* @see OPUS_GET_VBR_CONSTRAINT
|
|
||||||
* @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
|
|
||||||
* <dl>
|
|
||||||
* <dt>0</dt><dd>Hard CBR.</dd>
|
|
||||||
* <dt>1</dt><dd>VBR (default). The exact type of VBR may be retrieved via
|
|
||||||
* #OPUS_GET_VBR_CONSTRAINT.</dd>
|
|
||||||
* </dl>
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_GET_VBR(x) OPUS_GET_VBR_REQUEST, __opus_check_int_ptr(x)
|
|
||||||
|
|
||||||
/** Enables or disables constrained VBR in the encoder.
|
|
||||||
* This setting is ignored when the encoder is in CBR mode.
|
|
||||||
* @warning Only the MDCT mode of Opus currently heeds the constraint.
|
|
||||||
* Speech mode ignores it completely, hybrid mode may fail to obey it
|
|
||||||
* if the LPC layer uses more bitrate than the constraint would have
|
|
||||||
* permitted.
|
|
||||||
* @see OPUS_GET_VBR_CONSTRAINT
|
|
||||||
* @see OPUS_SET_VBR
|
|
||||||
* @param[in] x <tt>opus_int32</tt>: Allowed values:
|
|
||||||
* <dl>
|
|
||||||
* <dt>0</dt><dd>Unconstrained VBR.</dd>
|
|
||||||
* <dt>1</dt><dd>Constrained VBR (default). This creates a maximum of one
|
|
||||||
* frame of buffering delay assuming a transport with a
|
|
||||||
* serialization speed of the nominal bitrate.</dd>
|
|
||||||
* </dl>
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_SET_VBR_CONSTRAINT(x) OPUS_SET_VBR_CONSTRAINT_REQUEST, __opus_check_int(x)
|
|
||||||
/** Determine if constrained VBR is enabled in the encoder.
|
|
||||||
* @see OPUS_SET_VBR_CONSTRAINT
|
|
||||||
* @see OPUS_GET_VBR
|
|
||||||
* @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
|
|
||||||
* <dl>
|
|
||||||
* <dt>0</dt><dd>Unconstrained VBR.</dd>
|
|
||||||
* <dt>1</dt><dd>Constrained VBR (default).</dd>
|
|
||||||
* </dl>
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_GET_VBR_CONSTRAINT(x) OPUS_GET_VBR_CONSTRAINT_REQUEST, __opus_check_int_ptr(x)
|
|
||||||
|
|
||||||
/** Configures mono/stereo forcing in the encoder.
|
|
||||||
* This can force the encoder to produce packets encoded as either mono or
|
|
||||||
* stereo, regardless of the format of the input audio. This is useful when
|
|
||||||
* the caller knows that the input signal is currently a mono source embedded
|
|
||||||
* in a stereo stream.
|
|
||||||
* @see OPUS_GET_FORCE_CHANNELS
|
|
||||||
* @param[in] x <tt>opus_int32</tt>: Allowed values:
|
|
||||||
* <dl>
|
|
||||||
* <dt>#OPUS_AUTO</dt><dd>Not forced (default)</dd>
|
|
||||||
* <dt>1</dt> <dd>Forced mono</dd>
|
|
||||||
* <dt>2</dt> <dd>Forced stereo</dd>
|
|
||||||
* </dl>
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_SET_FORCE_CHANNELS(x) OPUS_SET_FORCE_CHANNELS_REQUEST, __opus_check_int(x)
|
|
||||||
/** Gets the encoder's forced channel configuration.
|
|
||||||
* @see OPUS_SET_FORCE_CHANNELS
|
|
||||||
* @param[out] x <tt>opus_int32 *</tt>:
|
|
||||||
* <dl>
|
|
||||||
* <dt>#OPUS_AUTO</dt><dd>Not forced (default)</dd>
|
|
||||||
* <dt>1</dt> <dd>Forced mono</dd>
|
|
||||||
* <dt>2</dt> <dd>Forced stereo</dd>
|
|
||||||
* </dl>
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_GET_FORCE_CHANNELS(x) OPUS_GET_FORCE_CHANNELS_REQUEST, __opus_check_int_ptr(x)
|
|
||||||
|
|
||||||
/** Configures the maximum bandpass that the encoder will select automatically.
|
|
||||||
* Applications should normally use this instead of #OPUS_SET_BANDWIDTH
|
|
||||||
* (leaving that set to the default, #OPUS_AUTO). This allows the
|
|
||||||
* application to set an upper bound based on the type of input it is
|
|
||||||
* providing, but still gives the encoder the freedom to reduce the bandpass
|
|
||||||
* when the bitrate becomes too low, for better overall quality.
|
|
||||||
* @see OPUS_GET_MAX_BANDWIDTH
|
|
||||||
* @param[in] x <tt>opus_int32</tt>: Allowed values:
|
|
||||||
* <dl>
|
|
||||||
* <dt>OPUS_BANDWIDTH_NARROWBAND</dt> <dd>4 kHz passband</dd>
|
|
||||||
* <dt>OPUS_BANDWIDTH_MEDIUMBAND</dt> <dd>6 kHz passband</dd>
|
|
||||||
* <dt>OPUS_BANDWIDTH_WIDEBAND</dt> <dd>8 kHz passband</dd>
|
|
||||||
* <dt>OPUS_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
|
|
||||||
* <dt>OPUS_BANDWIDTH_FULLBAND</dt> <dd>20 kHz passband (default)</dd>
|
|
||||||
* </dl>
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_SET_MAX_BANDWIDTH(x) OPUS_SET_MAX_BANDWIDTH_REQUEST, __opus_check_int(x)
|
|
||||||
|
|
||||||
/** Gets the encoder's configured maximum allowed bandpass.
|
|
||||||
* @see OPUS_SET_MAX_BANDWIDTH
|
|
||||||
* @param[out] x <tt>opus_int32 *</tt>: Allowed values:
|
|
||||||
* <dl>
|
|
||||||
* <dt>#OPUS_BANDWIDTH_NARROWBAND</dt> <dd>4 kHz passband</dd>
|
|
||||||
* <dt>#OPUS_BANDWIDTH_MEDIUMBAND</dt> <dd>6 kHz passband</dd>
|
|
||||||
* <dt>#OPUS_BANDWIDTH_WIDEBAND</dt> <dd>8 kHz passband</dd>
|
|
||||||
* <dt>#OPUS_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
|
|
||||||
* <dt>#OPUS_BANDWIDTH_FULLBAND</dt> <dd>20 kHz passband (default)</dd>
|
|
||||||
* </dl>
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_GET_MAX_BANDWIDTH(x) OPUS_GET_MAX_BANDWIDTH_REQUEST, __opus_check_int_ptr(x)
|
|
||||||
|
|
||||||
/** Sets the encoder's bandpass to a specific value.
|
|
||||||
* This prevents the encoder from automatically selecting the bandpass based
|
|
||||||
* on the available bitrate. If an application knows the bandpass of the input
|
|
||||||
* audio it is providing, it should normally use #OPUS_SET_MAX_BANDWIDTH
|
|
||||||
* instead, which still gives the encoder the freedom to reduce the bandpass
|
|
||||||
* when the bitrate becomes too low, for better overall quality.
|
|
||||||
* @see OPUS_GET_BANDWIDTH
|
|
||||||
* @param[in] x <tt>opus_int32</tt>: Allowed values:
|
|
||||||
* <dl>
|
|
||||||
* <dt>#OPUS_AUTO</dt> <dd>(default)</dd>
|
|
||||||
* <dt>#OPUS_BANDWIDTH_NARROWBAND</dt> <dd>4 kHz passband</dd>
|
|
||||||
* <dt>#OPUS_BANDWIDTH_MEDIUMBAND</dt> <dd>6 kHz passband</dd>
|
|
||||||
* <dt>#OPUS_BANDWIDTH_WIDEBAND</dt> <dd>8 kHz passband</dd>
|
|
||||||
* <dt>#OPUS_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
|
|
||||||
* <dt>#OPUS_BANDWIDTH_FULLBAND</dt> <dd>20 kHz passband</dd>
|
|
||||||
* </dl>
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_SET_BANDWIDTH(x) OPUS_SET_BANDWIDTH_REQUEST, __opus_check_int(x)
|
|
||||||
|
|
||||||
/** Configures the type of signal being encoded.
|
|
||||||
* This is a hint which helps the encoder's mode selection.
|
|
||||||
* @see OPUS_GET_SIGNAL
|
|
||||||
* @param[in] x <tt>opus_int32</tt>: Allowed values:
|
|
||||||
* <dl>
|
|
||||||
* <dt>#OPUS_AUTO</dt> <dd>(default)</dd>
|
|
||||||
* <dt>#OPUS_SIGNAL_VOICE</dt><dd>Bias thresholds towards choosing LPC or Hybrid modes.</dd>
|
|
||||||
* <dt>#OPUS_SIGNAL_MUSIC</dt><dd>Bias thresholds towards choosing MDCT modes.</dd>
|
|
||||||
* </dl>
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_SET_SIGNAL(x) OPUS_SET_SIGNAL_REQUEST, __opus_check_int(x)
|
|
||||||
/** Gets the encoder's configured signal type.
|
|
||||||
* @see OPUS_SET_SIGNAL
|
|
||||||
* @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
|
|
||||||
* <dl>
|
|
||||||
* <dt>#OPUS_AUTO</dt> <dd>(default)</dd>
|
|
||||||
* <dt>#OPUS_SIGNAL_VOICE</dt><dd>Bias thresholds towards choosing LPC or Hybrid modes.</dd>
|
|
||||||
* <dt>#OPUS_SIGNAL_MUSIC</dt><dd>Bias thresholds towards choosing MDCT modes.</dd>
|
|
||||||
* </dl>
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_GET_SIGNAL(x) OPUS_GET_SIGNAL_REQUEST, __opus_check_int_ptr(x)
|
|
||||||
|
|
||||||
|
|
||||||
/** Configures the encoder's intended application.
|
|
||||||
* The initial value is a mandatory argument to the encoder_create function.
|
|
||||||
* @see OPUS_GET_APPLICATION
|
|
||||||
* @param[in] x <tt>opus_int32</tt>: Returns one of the following values:
|
|
||||||
* <dl>
|
|
||||||
* <dt>#OPUS_APPLICATION_VOIP</dt>
|
|
||||||
* <dd>Process signal for improved speech intelligibility.</dd>
|
|
||||||
* <dt>#OPUS_APPLICATION_AUDIO</dt>
|
|
||||||
* <dd>Favor faithfulness to the original input.</dd>
|
|
||||||
* <dt>#OPUS_APPLICATION_RESTRICTED_LOWDELAY</dt>
|
|
||||||
* <dd>Configure the minimum possible coding delay by disabling certain modes
|
|
||||||
* of operation.</dd>
|
|
||||||
* </dl>
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_SET_APPLICATION(x) OPUS_SET_APPLICATION_REQUEST, __opus_check_int(x)
|
|
||||||
/** Gets the encoder's configured application.
|
|
||||||
* @see OPUS_SET_APPLICATION
|
|
||||||
* @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
|
|
||||||
* <dl>
|
|
||||||
* <dt>#OPUS_APPLICATION_VOIP</dt>
|
|
||||||
* <dd>Process signal for improved speech intelligibility.</dd>
|
|
||||||
* <dt>#OPUS_APPLICATION_AUDIO</dt>
|
|
||||||
* <dd>Favor faithfulness to the original input.</dd>
|
|
||||||
* <dt>#OPUS_APPLICATION_RESTRICTED_LOWDELAY</dt>
|
|
||||||
* <dd>Configure the minimum possible coding delay by disabling certain modes
|
|
||||||
* of operation.</dd>
|
|
||||||
* </dl>
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_GET_APPLICATION(x) OPUS_GET_APPLICATION_REQUEST, __opus_check_int_ptr(x)
|
|
||||||
|
|
||||||
/** Gets the total samples of delay added by the entire codec.
|
|
||||||
* This can be queried by the encoder and then the provided number of samples can be
|
|
||||||
* skipped on from the start of the decoder's output to provide time aligned input
|
|
||||||
* and output. From the perspective of a decoding application the real data begins this many
|
|
||||||
* samples late.
|
|
||||||
*
|
|
||||||
* The decoder contribution to this delay is identical for all decoders, but the
|
|
||||||
* encoder portion of the delay may vary from implementation to implementation,
|
|
||||||
* version to version, or even depend on the encoder's initial configuration.
|
|
||||||
* Applications needing delay compensation should call this CTL rather than
|
|
||||||
* hard-coding a value.
|
|
||||||
* @param[out] x <tt>opus_int32 *</tt>: Number of lookahead samples
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_GET_LOOKAHEAD(x) OPUS_GET_LOOKAHEAD_REQUEST, __opus_check_int_ptr(x)
|
|
||||||
|
|
||||||
/** Configures the encoder's use of inband forward error correction (FEC).
|
|
||||||
* @note This is only applicable to the LPC layer
|
|
||||||
* @see OPUS_GET_INBAND_FEC
|
|
||||||
* @param[in] x <tt>opus_int32</tt>: Allowed values:
|
|
||||||
* <dl>
|
|
||||||
* <dt>0</dt><dd>Disable inband FEC (default).</dd>
|
|
||||||
* <dt>1</dt><dd>Enable inband FEC.</dd>
|
|
||||||
* </dl>
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_SET_INBAND_FEC(x) OPUS_SET_INBAND_FEC_REQUEST, __opus_check_int(x)
|
|
||||||
/** Gets encoder's configured use of inband forward error correction.
|
|
||||||
* @see OPUS_SET_INBAND_FEC
|
|
||||||
* @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
|
|
||||||
* <dl>
|
|
||||||
* <dt>0</dt><dd>Inband FEC disabled (default).</dd>
|
|
||||||
* <dt>1</dt><dd>Inband FEC enabled.</dd>
|
|
||||||
* </dl>
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_GET_INBAND_FEC(x) OPUS_GET_INBAND_FEC_REQUEST, __opus_check_int_ptr(x)
|
|
||||||
|
|
||||||
/** Configures the encoder's expected packet loss percentage.
|
|
||||||
* Higher values trigger progressively more loss resistant behavior in the encoder
|
|
||||||
* at the expense of quality at a given bitrate in the absence of packet loss, but
|
|
||||||
* greater quality under loss.
|
|
||||||
* @see OPUS_GET_PACKET_LOSS_PERC
|
|
||||||
* @param[in] x <tt>opus_int32</tt>: Loss percentage in the range 0-100, inclusive (default: 0).
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_SET_PACKET_LOSS_PERC(x) OPUS_SET_PACKET_LOSS_PERC_REQUEST, __opus_check_int(x)
|
|
||||||
/** Gets the encoder's configured packet loss percentage.
|
|
||||||
* @see OPUS_SET_PACKET_LOSS_PERC
|
|
||||||
* @param[out] x <tt>opus_int32 *</tt>: Returns the configured loss percentage
|
|
||||||
* in the range 0-100, inclusive (default: 0).
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_GET_PACKET_LOSS_PERC(x) OPUS_GET_PACKET_LOSS_PERC_REQUEST, __opus_check_int_ptr(x)
|
|
||||||
|
|
||||||
/** Configures the encoder's use of discontinuous transmission (DTX).
|
|
||||||
* @note This is only applicable to the LPC layer
|
|
||||||
* @see OPUS_GET_DTX
|
|
||||||
* @param[in] x <tt>opus_int32</tt>: Allowed values:
|
|
||||||
* <dl>
|
|
||||||
* <dt>0</dt><dd>Disable DTX (default).</dd>
|
|
||||||
* <dt>1</dt><dd>Enabled DTX.</dd>
|
|
||||||
* </dl>
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_SET_DTX(x) OPUS_SET_DTX_REQUEST, __opus_check_int(x)
|
|
||||||
/** Gets encoder's configured use of discontinuous transmission.
|
|
||||||
* @see OPUS_SET_DTX
|
|
||||||
* @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
|
|
||||||
* <dl>
|
|
||||||
* <dt>0</dt><dd>DTX disabled (default).</dd>
|
|
||||||
* <dt>1</dt><dd>DTX enabled.</dd>
|
|
||||||
* </dl>
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_GET_DTX(x) OPUS_GET_DTX_REQUEST, __opus_check_int_ptr(x)
|
|
||||||
/** Configures the depth of signal being encoded.
|
|
||||||
*
|
|
||||||
* This is a hint which helps the encoder identify silence and near-silence.
|
|
||||||
* It represents the number of significant bits of linear intensity below
|
|
||||||
* which the signal contains ignorable quantization or other noise.
|
|
||||||
*
|
|
||||||
* For example, OPUS_SET_LSB_DEPTH(14) would be an appropriate setting
|
|
||||||
* for G.711 u-law input. OPUS_SET_LSB_DEPTH(16) would be appropriate
|
|
||||||
* for 16-bit linear pcm input with opus_encode_float().
|
|
||||||
*
|
|
||||||
* When using opus_encode() instead of opus_encode_float(), or when libopus
|
|
||||||
* is compiled for fixed-point, the encoder uses the minimum of the value
|
|
||||||
* set here and the value 16.
|
|
||||||
*
|
|
||||||
* @see OPUS_GET_LSB_DEPTH
|
|
||||||
* @param[in] x <tt>opus_int32</tt>: Input precision in bits, between 8 and 24
|
|
||||||
* (default: 24).
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_SET_LSB_DEPTH(x) OPUS_SET_LSB_DEPTH_REQUEST, __opus_check_int(x)
|
|
||||||
/** Gets the encoder's configured signal depth.
|
|
||||||
* @see OPUS_SET_LSB_DEPTH
|
|
||||||
* @param[out] x <tt>opus_int32 *</tt>: Input precision in bits, between 8 and
|
|
||||||
* 24 (default: 24).
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_GET_LSB_DEPTH(x) OPUS_GET_LSB_DEPTH_REQUEST, __opus_check_int_ptr(x)
|
|
||||||
|
|
||||||
/** Configures the encoder's use of variable duration frames.
|
|
||||||
* When variable duration is enabled, the encoder is free to use a shorter frame
|
|
||||||
* size than the one requested in the opus_encode*() call.
|
|
||||||
* It is then the user's responsibility
|
|
||||||
* to verify how much audio was encoded by checking the ToC byte of the encoded
|
|
||||||
* packet. The part of the audio that was not encoded needs to be resent to the
|
|
||||||
* encoder for the next call. Do not use this option unless you <b>really</b>
|
|
||||||
* know what you are doing.
|
|
||||||
* @see OPUS_GET_EXPERT_FRAME_DURATION
|
|
||||||
* @param[in] x <tt>opus_int32</tt>: Allowed values:
|
|
||||||
* <dl>
|
|
||||||
* <dt>OPUS_FRAMESIZE_ARG</dt><dd>Select frame size from the argument (default).</dd>
|
|
||||||
* <dt>OPUS_FRAMESIZE_2_5_MS</dt><dd>Use 2.5 ms frames.</dd>
|
|
||||||
* <dt>OPUS_FRAMESIZE_5_MS</dt><dd>Use 5 ms frames.</dd>
|
|
||||||
* <dt>OPUS_FRAMESIZE_10_MS</dt><dd>Use 10 ms frames.</dd>
|
|
||||||
* <dt>OPUS_FRAMESIZE_20_MS</dt><dd>Use 20 ms frames.</dd>
|
|
||||||
* <dt>OPUS_FRAMESIZE_40_MS</dt><dd>Use 40 ms frames.</dd>
|
|
||||||
* <dt>OPUS_FRAMESIZE_60_MS</dt><dd>Use 60 ms frames.</dd>
|
|
||||||
* <dt>OPUS_FRAMESIZE_80_MS</dt><dd>Use 80 ms frames.</dd>
|
|
||||||
* <dt>OPUS_FRAMESIZE_100_MS</dt><dd>Use 100 ms frames.</dd>
|
|
||||||
* <dt>OPUS_FRAMESIZE_120_MS</dt><dd>Use 120 ms frames.</dd>
|
|
||||||
* </dl>
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_SET_EXPERT_FRAME_DURATION(x) OPUS_SET_EXPERT_FRAME_DURATION_REQUEST, __opus_check_int(x)
|
|
||||||
/** Gets the encoder's configured use of variable duration frames.
|
|
||||||
* @see OPUS_SET_EXPERT_FRAME_DURATION
|
|
||||||
* @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
|
|
||||||
* <dl>
|
|
||||||
* <dt>OPUS_FRAMESIZE_ARG</dt><dd>Select frame size from the argument (default).</dd>
|
|
||||||
* <dt>OPUS_FRAMESIZE_2_5_MS</dt><dd>Use 2.5 ms frames.</dd>
|
|
||||||
* <dt>OPUS_FRAMESIZE_5_MS</dt><dd>Use 5 ms frames.</dd>
|
|
||||||
* <dt>OPUS_FRAMESIZE_10_MS</dt><dd>Use 10 ms frames.</dd>
|
|
||||||
* <dt>OPUS_FRAMESIZE_20_MS</dt><dd>Use 20 ms frames.</dd>
|
|
||||||
* <dt>OPUS_FRAMESIZE_40_MS</dt><dd>Use 40 ms frames.</dd>
|
|
||||||
* <dt>OPUS_FRAMESIZE_60_MS</dt><dd>Use 60 ms frames.</dd>
|
|
||||||
* <dt>OPUS_FRAMESIZE_80_MS</dt><dd>Use 80 ms frames.</dd>
|
|
||||||
* <dt>OPUS_FRAMESIZE_100_MS</dt><dd>Use 100 ms frames.</dd>
|
|
||||||
* <dt>OPUS_FRAMESIZE_120_MS</dt><dd>Use 120 ms frames.</dd>
|
|
||||||
* </dl>
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_GET_EXPERT_FRAME_DURATION(x) OPUS_GET_EXPERT_FRAME_DURATION_REQUEST, __opus_check_int_ptr(x)
|
|
||||||
|
|
||||||
/** If set to 1, disables almost all use of prediction, making frames almost
|
|
||||||
* completely independent. This reduces quality.
|
|
||||||
* @see OPUS_GET_PREDICTION_DISABLED
|
|
||||||
* @param[in] x <tt>opus_int32</tt>: Allowed values:
|
|
||||||
* <dl>
|
|
||||||
* <dt>0</dt><dd>Enable prediction (default).</dd>
|
|
||||||
* <dt>1</dt><dd>Disable prediction.</dd>
|
|
||||||
* </dl>
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_SET_PREDICTION_DISABLED(x) OPUS_SET_PREDICTION_DISABLED_REQUEST, __opus_check_int(x)
|
|
||||||
/** Gets the encoder's configured prediction status.
|
|
||||||
* @see OPUS_SET_PREDICTION_DISABLED
|
|
||||||
* @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
|
|
||||||
* <dl>
|
|
||||||
* <dt>0</dt><dd>Prediction enabled (default).</dd>
|
|
||||||
* <dt>1</dt><dd>Prediction disabled.</dd>
|
|
||||||
* </dl>
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_GET_PREDICTION_DISABLED(x) OPUS_GET_PREDICTION_DISABLED_REQUEST, __opus_check_int_ptr(x)
|
|
||||||
|
|
||||||
/**@}*/
|
|
||||||
|
|
||||||
/** @defgroup opus_genericctls Generic CTLs
|
|
||||||
*
|
|
||||||
* These macros are used with the \c opus_decoder_ctl and
|
|
||||||
* \c opus_encoder_ctl calls to generate a particular
|
|
||||||
* request.
|
|
||||||
*
|
|
||||||
* When called on an \c OpusDecoder they apply to that
|
|
||||||
* particular decoder instance. When called on an
|
|
||||||
* \c OpusEncoder they apply to the corresponding setting
|
|
||||||
* on that encoder instance, if present.
|
|
||||||
*
|
|
||||||
* Some usage examples:
|
|
||||||
*
|
|
||||||
* @code
|
|
||||||
* int ret;
|
|
||||||
* opus_int32 pitch;
|
|
||||||
* ret = opus_decoder_ctl(dec_ctx, OPUS_GET_PITCH(&pitch));
|
|
||||||
* if (ret == OPUS_OK) return ret;
|
|
||||||
*
|
|
||||||
* opus_encoder_ctl(enc_ctx, OPUS_RESET_STATE);
|
|
||||||
* opus_decoder_ctl(dec_ctx, OPUS_RESET_STATE);
|
|
||||||
*
|
|
||||||
* opus_int32 enc_bw, dec_bw;
|
|
||||||
* opus_encoder_ctl(enc_ctx, OPUS_GET_BANDWIDTH(&enc_bw));
|
|
||||||
* opus_decoder_ctl(dec_ctx, OPUS_GET_BANDWIDTH(&dec_bw));
|
|
||||||
* if (enc_bw != dec_bw) {
|
|
||||||
* printf("packet bandwidth mismatch!\n");
|
|
||||||
* }
|
|
||||||
* @endcode
|
|
||||||
*
|
|
||||||
* @see opus_encoder, opus_decoder_ctl, opus_encoder_ctl, opus_decoderctls, opus_encoderctls
|
|
||||||
* @{
|
|
||||||
*/
|
|
||||||
|
|
||||||
/** Resets the codec state to be equivalent to a freshly initialized state.
|
|
||||||
* This should be called when switching streams in order to prevent
|
|
||||||
* the back to back decoding from giving different results from
|
|
||||||
* one at a time decoding.
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_RESET_STATE 4028
|
|
||||||
|
|
||||||
/** Gets the final state of the codec's entropy coder.
|
|
||||||
* This is used for testing purposes,
|
|
||||||
* The encoder and decoder state should be identical after coding a payload
|
|
||||||
* (assuming no data corruption or software bugs)
|
|
||||||
*
|
|
||||||
* @param[out] x <tt>opus_uint32 *</tt>: Entropy coder state
|
|
||||||
*
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_GET_FINAL_RANGE(x) OPUS_GET_FINAL_RANGE_REQUEST, __opus_check_uint_ptr(x)
|
|
||||||
|
|
||||||
/** Gets the encoder's configured bandpass or the decoder's last bandpass.
|
|
||||||
* @see OPUS_SET_BANDWIDTH
|
|
||||||
* @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
|
|
||||||
* <dl>
|
|
||||||
* <dt>#OPUS_AUTO</dt> <dd>(default)</dd>
|
|
||||||
* <dt>#OPUS_BANDWIDTH_NARROWBAND</dt> <dd>4 kHz passband</dd>
|
|
||||||
* <dt>#OPUS_BANDWIDTH_MEDIUMBAND</dt> <dd>6 kHz passband</dd>
|
|
||||||
* <dt>#OPUS_BANDWIDTH_WIDEBAND</dt> <dd>8 kHz passband</dd>
|
|
||||||
* <dt>#OPUS_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
|
|
||||||
* <dt>#OPUS_BANDWIDTH_FULLBAND</dt> <dd>20 kHz passband</dd>
|
|
||||||
* </dl>
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_GET_BANDWIDTH(x) OPUS_GET_BANDWIDTH_REQUEST, __opus_check_int_ptr(x)
|
|
||||||
|
|
||||||
/** Gets the sampling rate the encoder or decoder was initialized with.
|
|
||||||
* This simply returns the <code>Fs</code> value passed to opus_encoder_init()
|
|
||||||
* or opus_decoder_init().
|
|
||||||
* @param[out] x <tt>opus_int32 *</tt>: Sampling rate of encoder or decoder.
|
|
||||||
* @hideinitializer
|
|
||||||
*/
|
|
||||||
#define OPUS_GET_SAMPLE_RATE(x) OPUS_GET_SAMPLE_RATE_REQUEST, __opus_check_int_ptr(x)
|
|
||||||
|
|
||||||
/** If set to 1, disables the use of phase inversion for intensity stereo,
|
|
||||||
* improving the quality of mono downmixes, but slightly reducing normal
|
|
||||||
* stereo quality. Disabling phase inversion in the decoder does not comply
|
|
||||||
* with RFC 6716, although it does not cause any interoperability issue and
|
|
||||||
* is expected to become part of the Opus standard once RFC 6716 is updated
|
|
||||||
* by draft-ietf-codec-opus-update.
|
|
||||||
* @see OPUS_GET_PHASE_INVERSION_DISABLED
|
|
||||||
* @param[in] x <tt>opus_int32</tt>: Allowed values:
|
|
||||||
* <dl>
|
|
||||||
* <dt>0</dt><dd>Enable phase inversion (default).</dd>
|
|
||||||
* <dt>1</dt><dd>Disable phase inversion.</dd>
|
|
||||||
* </dl>
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_SET_PHASE_INVERSION_DISABLED(x) OPUS_SET_PHASE_INVERSION_DISABLED_REQUEST, __opus_check_int(x)
|
|
||||||
/** Gets the encoder's configured phase inversion status.
|
|
||||||
* @see OPUS_SET_PHASE_INVERSION_DISABLED
|
|
||||||
* @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
|
|
||||||
* <dl>
|
|
||||||
* <dt>0</dt><dd>Stereo phase inversion enabled (default).</dd>
|
|
||||||
* <dt>1</dt><dd>Stereo phase inversion disabled.</dd>
|
|
||||||
* </dl>
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_GET_PHASE_INVERSION_DISABLED(x) OPUS_GET_PHASE_INVERSION_DISABLED_REQUEST, __opus_check_int_ptr(x)
|
|
||||||
|
|
||||||
/**@}*/
|
|
||||||
|
|
||||||
/** @defgroup opus_decoderctls Decoder related CTLs
|
|
||||||
* @see opus_genericctls, opus_encoderctls, opus_decoder
|
|
||||||
* @{
|
|
||||||
*/
|
|
||||||
|
|
||||||
/** Configures decoder gain adjustment.
|
|
||||||
* Scales the decoded output by a factor specified in Q8 dB units.
|
|
||||||
* This has a maximum range of -32768 to 32767 inclusive, and returns
|
|
||||||
* OPUS_BAD_ARG otherwise. The default is zero indicating no adjustment.
|
|
||||||
* This setting survives decoder reset.
|
|
||||||
*
|
|
||||||
* gain = pow(10, x/(20.0*256))
|
|
||||||
*
|
|
||||||
* @param[in] x <tt>opus_int32</tt>: Amount to scale PCM signal by in Q8 dB units.
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_SET_GAIN(x) OPUS_SET_GAIN_REQUEST, __opus_check_int(x)
|
|
||||||
/** Gets the decoder's configured gain adjustment. @see OPUS_SET_GAIN
|
|
||||||
*
|
|
||||||
* @param[out] x <tt>opus_int32 *</tt>: Amount to scale PCM signal by in Q8 dB units.
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_GET_GAIN(x) OPUS_GET_GAIN_REQUEST, __opus_check_int_ptr(x)
|
|
||||||
|
|
||||||
/** Gets the duration (in samples) of the last packet successfully decoded or concealed.
|
|
||||||
* @param[out] x <tt>opus_int32 *</tt>: Number of samples (at current sampling rate).
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_GET_LAST_PACKET_DURATION(x) OPUS_GET_LAST_PACKET_DURATION_REQUEST, __opus_check_int_ptr(x)
|
|
||||||
|
|
||||||
/** Gets the pitch of the last decoded frame, if available.
|
|
||||||
* This can be used for any post-processing algorithm requiring the use of pitch,
|
|
||||||
* e.g. time stretching/shortening. If the last frame was not voiced, or if the
|
|
||||||
* pitch was not coded in the frame, then zero is returned.
|
|
||||||
*
|
|
||||||
* This CTL is only implemented for decoder instances.
|
|
||||||
*
|
|
||||||
* @param[out] x <tt>opus_int32 *</tt>: pitch period at 48 kHz (or 0 if not available)
|
|
||||||
*
|
|
||||||
* @hideinitializer */
|
|
||||||
#define OPUS_GET_PITCH(x) OPUS_GET_PITCH_REQUEST, __opus_check_int_ptr(x)
|
|
||||||
|
|
||||||
/**@}*/
|
|
||||||
|
|
||||||
/** @defgroup opus_libinfo Opus library information functions
|
|
||||||
* @{
|
|
||||||
*/
|
|
||||||
|
|
||||||
/** Converts an opus error code into a human readable string.
|
|
||||||
*
|
|
||||||
* @param[in] error <tt>int</tt>: Error number
|
|
||||||
* @returns Error string
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT const char *opus_strerror(int error);
|
|
||||||
|
|
||||||
/** Gets the libopus version string.
|
|
||||||
*
|
|
||||||
* Applications may look for the substring "-fixed" in the version string to
|
|
||||||
* determine whether they have a fixed-point or floating-point build at
|
|
||||||
* runtime.
|
|
||||||
*
|
|
||||||
* @returns Version string
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT const char *opus_get_version_string(void);
|
|
||||||
/**@}*/
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* OPUS_DEFINES_H */
|
|
|
@ -1,660 +0,0 @@
|
||||||
/* Copyright (c) 2011 Xiph.Org Foundation
|
|
||||||
Written by Jean-Marc Valin */
|
|
||||||
/*
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
|
||||||
modification, are permitted provided that the following conditions
|
|
||||||
are met:
|
|
||||||
|
|
||||||
- Redistributions of source code must retain the above copyright
|
|
||||||
notice, this list of conditions and the following disclaimer.
|
|
||||||
|
|
||||||
- Redistributions in binary form must reproduce the above copyright
|
|
||||||
notice, this list of conditions and the following disclaimer in the
|
|
||||||
documentation and/or other materials provided with the distribution.
|
|
||||||
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
||||||
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
||||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
||||||
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
|
|
||||||
OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
|
||||||
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
|
||||||
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
|
||||||
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
|
||||||
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @file opus_multistream.h
|
|
||||||
* @brief Opus reference implementation multistream API
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef OPUS_MULTISTREAM_H
|
|
||||||
#define OPUS_MULTISTREAM_H
|
|
||||||
|
|
||||||
#include "opus.h"
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/** @cond OPUS_INTERNAL_DOC */
|
|
||||||
|
|
||||||
/** Macros to trigger compilation errors when the wrong types are provided to a
|
|
||||||
* CTL. */
|
|
||||||
/**@{*/
|
|
||||||
#define __opus_check_encstate_ptr(ptr) ((ptr) + ((ptr) - (OpusEncoder**)(ptr)))
|
|
||||||
#define __opus_check_decstate_ptr(ptr) ((ptr) + ((ptr) - (OpusDecoder**)(ptr)))
|
|
||||||
/**@}*/
|
|
||||||
|
|
||||||
/** These are the actual encoder and decoder CTL ID numbers.
|
|
||||||
* They should not be used directly by applications.
|
|
||||||
* In general, SETs should be even and GETs should be odd.*/
|
|
||||||
/**@{*/
|
|
||||||
#define OPUS_MULTISTREAM_GET_ENCODER_STATE_REQUEST 5120
|
|
||||||
#define OPUS_MULTISTREAM_GET_DECODER_STATE_REQUEST 5122
|
|
||||||
/**@}*/
|
|
||||||
|
|
||||||
/** @endcond */
|
|
||||||
|
|
||||||
/** @defgroup opus_multistream_ctls Multistream specific encoder and decoder CTLs
|
|
||||||
*
|
|
||||||
* These are convenience macros that are specific to the
|
|
||||||
* opus_multistream_encoder_ctl() and opus_multistream_decoder_ctl()
|
|
||||||
* interface.
|
|
||||||
* The CTLs from @ref opus_genericctls, @ref opus_encoderctls, and
|
|
||||||
* @ref opus_decoderctls may be applied to a multistream encoder or decoder as
|
|
||||||
* well.
|
|
||||||
* In addition, you may retrieve the encoder or decoder state for an specific
|
|
||||||
* stream via #OPUS_MULTISTREAM_GET_ENCODER_STATE or
|
|
||||||
* #OPUS_MULTISTREAM_GET_DECODER_STATE and apply CTLs to it individually.
|
|
||||||
*/
|
|
||||||
/**@{*/
|
|
||||||
|
|
||||||
/** Gets the encoder state for an individual stream of a multistream encoder.
|
|
||||||
* @param[in] x <tt>opus_int32</tt>: The index of the stream whose encoder you
|
|
||||||
* wish to retrieve.
|
|
||||||
* This must be non-negative and less than
|
|
||||||
* the <code>streams</code> parameter used
|
|
||||||
* to initialize the encoder.
|
|
||||||
* @param[out] y <tt>OpusEncoder**</tt>: Returns a pointer to the given
|
|
||||||
* encoder state.
|
|
||||||
* @retval OPUS_BAD_ARG The index of the requested stream was out of range.
|
|
||||||
* @hideinitializer
|
|
||||||
*/
|
|
||||||
#define OPUS_MULTISTREAM_GET_ENCODER_STATE(x,y) OPUS_MULTISTREAM_GET_ENCODER_STATE_REQUEST, __opus_check_int(x), __opus_check_encstate_ptr(y)
|
|
||||||
|
|
||||||
/** Gets the decoder state for an individual stream of a multistream decoder.
|
|
||||||
* @param[in] x <tt>opus_int32</tt>: The index of the stream whose decoder you
|
|
||||||
* wish to retrieve.
|
|
||||||
* This must be non-negative and less than
|
|
||||||
* the <code>streams</code> parameter used
|
|
||||||
* to initialize the decoder.
|
|
||||||
* @param[out] y <tt>OpusDecoder**</tt>: Returns a pointer to the given
|
|
||||||
* decoder state.
|
|
||||||
* @retval OPUS_BAD_ARG The index of the requested stream was out of range.
|
|
||||||
* @hideinitializer
|
|
||||||
*/
|
|
||||||
#define OPUS_MULTISTREAM_GET_DECODER_STATE(x,y) OPUS_MULTISTREAM_GET_DECODER_STATE_REQUEST, __opus_check_int(x), __opus_check_decstate_ptr(y)
|
|
||||||
|
|
||||||
/**@}*/
|
|
||||||
|
|
||||||
/** @defgroup opus_multistream Opus Multistream API
|
|
||||||
* @{
|
|
||||||
*
|
|
||||||
* The multistream API allows individual Opus streams to be combined into a
|
|
||||||
* single packet, enabling support for up to 255 channels. Unlike an
|
|
||||||
* elementary Opus stream, the encoder and decoder must negotiate the channel
|
|
||||||
* configuration before the decoder can successfully interpret the data in the
|
|
||||||
* packets produced by the encoder. Some basic information, such as packet
|
|
||||||
* duration, can be computed without any special negotiation.
|
|
||||||
*
|
|
||||||
* The format for multistream Opus packets is defined in
|
|
||||||
* <a href="https://tools.ietf.org/html/rfc7845">RFC 7845</a>
|
|
||||||
* and is based on the self-delimited Opus framing described in Appendix B of
|
|
||||||
* <a href="https://tools.ietf.org/html/rfc6716">RFC 6716</a>.
|
|
||||||
* Normal Opus packets are just a degenerate case of multistream Opus packets,
|
|
||||||
* and can be encoded or decoded with the multistream API by setting
|
|
||||||
* <code>streams</code> to <code>1</code> when initializing the encoder or
|
|
||||||
* decoder.
|
|
||||||
*
|
|
||||||
* Multistream Opus streams can contain up to 255 elementary Opus streams.
|
|
||||||
* These may be either "uncoupled" or "coupled", indicating that the decoder
|
|
||||||
* is configured to decode them to either 1 or 2 channels, respectively.
|
|
||||||
* The streams are ordered so that all coupled streams appear at the
|
|
||||||
* beginning.
|
|
||||||
*
|
|
||||||
* A <code>mapping</code> table defines which decoded channel <code>i</code>
|
|
||||||
* should be used for each input/output (I/O) channel <code>j</code>. This table is
|
|
||||||
* typically provided as an unsigned char array.
|
|
||||||
* Let <code>i = mapping[j]</code> be the index for I/O channel <code>j</code>.
|
|
||||||
* If <code>i < 2*coupled_streams</code>, then I/O channel <code>j</code> is
|
|
||||||
* encoded as the left channel of stream <code>(i/2)</code> if <code>i</code>
|
|
||||||
* is even, or as the right channel of stream <code>(i/2)</code> if
|
|
||||||
* <code>i</code> is odd. Otherwise, I/O channel <code>j</code> is encoded as
|
|
||||||
* mono in stream <code>(i - coupled_streams)</code>, unless it has the special
|
|
||||||
* value 255, in which case it is omitted from the encoding entirely (the
|
|
||||||
* decoder will reproduce it as silence). Each value <code>i</code> must either
|
|
||||||
* be the special value 255 or be less than <code>streams + coupled_streams</code>.
|
|
||||||
*
|
|
||||||
* The output channels specified by the encoder
|
|
||||||
* should use the
|
|
||||||
* <a href="https://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-810004.3.9">Vorbis
|
|
||||||
* channel ordering</a>. A decoder may wish to apply an additional permutation
|
|
||||||
* to the mapping the encoder used to achieve a different output channel
|
|
||||||
* order (e.g. for outputing in WAV order).
|
|
||||||
*
|
|
||||||
* Each multistream packet contains an Opus packet for each stream, and all of
|
|
||||||
* the Opus packets in a single multistream packet must have the same
|
|
||||||
* duration. Therefore the duration of a multistream packet can be extracted
|
|
||||||
* from the TOC sequence of the first stream, which is located at the
|
|
||||||
* beginning of the packet, just like an elementary Opus stream:
|
|
||||||
*
|
|
||||||
* @code
|
|
||||||
* int nb_samples;
|
|
||||||
* int nb_frames;
|
|
||||||
* nb_frames = opus_packet_get_nb_frames(data, len);
|
|
||||||
* if (nb_frames < 1)
|
|
||||||
* return nb_frames;
|
|
||||||
* nb_samples = opus_packet_get_samples_per_frame(data, 48000) * nb_frames;
|
|
||||||
* @endcode
|
|
||||||
*
|
|
||||||
* The general encoding and decoding process proceeds exactly the same as in
|
|
||||||
* the normal @ref opus_encoder and @ref opus_decoder APIs.
|
|
||||||
* See their documentation for an overview of how to use the corresponding
|
|
||||||
* multistream functions.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/** Opus multistream encoder state.
|
|
||||||
* This contains the complete state of a multistream Opus encoder.
|
|
||||||
* It is position independent and can be freely copied.
|
|
||||||
* @see opus_multistream_encoder_create
|
|
||||||
* @see opus_multistream_encoder_init
|
|
||||||
*/
|
|
||||||
typedef struct OpusMSEncoder OpusMSEncoder;
|
|
||||||
|
|
||||||
/** Opus multistream decoder state.
|
|
||||||
* This contains the complete state of a multistream Opus decoder.
|
|
||||||
* It is position independent and can be freely copied.
|
|
||||||
* @see opus_multistream_decoder_create
|
|
||||||
* @see opus_multistream_decoder_init
|
|
||||||
*/
|
|
||||||
typedef struct OpusMSDecoder OpusMSDecoder;
|
|
||||||
|
|
||||||
/**\name Multistream encoder functions */
|
|
||||||
/**@{*/
|
|
||||||
|
|
||||||
/** Gets the size of an OpusMSEncoder structure.
|
|
||||||
* @param streams <tt>int</tt>: The total number of streams to encode from the
|
|
||||||
* input.
|
|
||||||
* This must be no more than 255.
|
|
||||||
* @param coupled_streams <tt>int</tt>: Number of coupled (2 channel) streams
|
|
||||||
* to encode.
|
|
||||||
* This must be no larger than the total
|
|
||||||
* number of streams.
|
|
||||||
* Additionally, The total number of
|
|
||||||
* encoded channels (<code>streams +
|
|
||||||
* coupled_streams</code>) must be no
|
|
||||||
* more than 255.
|
|
||||||
* @returns The size in bytes on success, or a negative error code
|
|
||||||
* (see @ref opus_errorcodes) on error.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_multistream_encoder_get_size(
|
|
||||||
int streams,
|
|
||||||
int coupled_streams
|
|
||||||
);
|
|
||||||
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_multistream_surround_encoder_get_size(
|
|
||||||
int channels,
|
|
||||||
int mapping_family
|
|
||||||
);
|
|
||||||
|
|
||||||
|
|
||||||
/** Allocates and initializes a multistream encoder state.
|
|
||||||
* Call opus_multistream_encoder_destroy() to release
|
|
||||||
* this object when finished.
|
|
||||||
* @param Fs <tt>opus_int32</tt>: Sampling rate of the input signal (in Hz).
|
|
||||||
* This must be one of 8000, 12000, 16000,
|
|
||||||
* 24000, or 48000.
|
|
||||||
* @param channels <tt>int</tt>: Number of channels in the input signal.
|
|
||||||
* This must be at most 255.
|
|
||||||
* It may be greater than the number of
|
|
||||||
* coded channels (<code>streams +
|
|
||||||
* coupled_streams</code>).
|
|
||||||
* @param streams <tt>int</tt>: The total number of streams to encode from the
|
|
||||||
* input.
|
|
||||||
* This must be no more than the number of channels.
|
|
||||||
* @param coupled_streams <tt>int</tt>: Number of coupled (2 channel) streams
|
|
||||||
* to encode.
|
|
||||||
* This must be no larger than the total
|
|
||||||
* number of streams.
|
|
||||||
* Additionally, The total number of
|
|
||||||
* encoded channels (<code>streams +
|
|
||||||
* coupled_streams</code>) must be no
|
|
||||||
* more than the number of input channels.
|
|
||||||
* @param[in] mapping <code>const unsigned char[channels]</code>: Mapping from
|
|
||||||
* encoded channels to input channels, as described in
|
|
||||||
* @ref opus_multistream. As an extra constraint, the
|
|
||||||
* multistream encoder does not allow encoding coupled
|
|
||||||
* streams for which one channel is unused since this
|
|
||||||
* is never a good idea.
|
|
||||||
* @param application <tt>int</tt>: The target encoder application.
|
|
||||||
* This must be one of the following:
|
|
||||||
* <dl>
|
|
||||||
* <dt>#OPUS_APPLICATION_VOIP</dt>
|
|
||||||
* <dd>Process signal for improved speech intelligibility.</dd>
|
|
||||||
* <dt>#OPUS_APPLICATION_AUDIO</dt>
|
|
||||||
* <dd>Favor faithfulness to the original input.</dd>
|
|
||||||
* <dt>#OPUS_APPLICATION_RESTRICTED_LOWDELAY</dt>
|
|
||||||
* <dd>Configure the minimum possible coding delay by disabling certain modes
|
|
||||||
* of operation.</dd>
|
|
||||||
* </dl>
|
|
||||||
* @param[out] error <tt>int *</tt>: Returns #OPUS_OK on success, or an error
|
|
||||||
* code (see @ref opus_errorcodes) on
|
|
||||||
* failure.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusMSEncoder *opus_multistream_encoder_create(
|
|
||||||
opus_int32 Fs,
|
|
||||||
int channels,
|
|
||||||
int streams,
|
|
||||||
int coupled_streams,
|
|
||||||
const unsigned char *mapping,
|
|
||||||
int application,
|
|
||||||
int *error
|
|
||||||
) OPUS_ARG_NONNULL(5);
|
|
||||||
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusMSEncoder *opus_multistream_surround_encoder_create(
|
|
||||||
opus_int32 Fs,
|
|
||||||
int channels,
|
|
||||||
int mapping_family,
|
|
||||||
int *streams,
|
|
||||||
int *coupled_streams,
|
|
||||||
unsigned char *mapping,
|
|
||||||
int application,
|
|
||||||
int *error
|
|
||||||
) OPUS_ARG_NONNULL(4) OPUS_ARG_NONNULL(5) OPUS_ARG_NONNULL(6);
|
|
||||||
|
|
||||||
/** Initialize a previously allocated multistream encoder state.
|
|
||||||
* The memory pointed to by \a st must be at least the size returned by
|
|
||||||
* opus_multistream_encoder_get_size().
|
|
||||||
* This is intended for applications which use their own allocator instead of
|
|
||||||
* malloc.
|
|
||||||
* To reset a previously initialized state, use the #OPUS_RESET_STATE CTL.
|
|
||||||
* @see opus_multistream_encoder_create
|
|
||||||
* @see opus_multistream_encoder_get_size
|
|
||||||
* @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state to initialize.
|
|
||||||
* @param Fs <tt>opus_int32</tt>: Sampling rate of the input signal (in Hz).
|
|
||||||
* This must be one of 8000, 12000, 16000,
|
|
||||||
* 24000, or 48000.
|
|
||||||
* @param channels <tt>int</tt>: Number of channels in the input signal.
|
|
||||||
* This must be at most 255.
|
|
||||||
* It may be greater than the number of
|
|
||||||
* coded channels (<code>streams +
|
|
||||||
* coupled_streams</code>).
|
|
||||||
* @param streams <tt>int</tt>: The total number of streams to encode from the
|
|
||||||
* input.
|
|
||||||
* This must be no more than the number of channels.
|
|
||||||
* @param coupled_streams <tt>int</tt>: Number of coupled (2 channel) streams
|
|
||||||
* to encode.
|
|
||||||
* This must be no larger than the total
|
|
||||||
* number of streams.
|
|
||||||
* Additionally, The total number of
|
|
||||||
* encoded channels (<code>streams +
|
|
||||||
* coupled_streams</code>) must be no
|
|
||||||
* more than the number of input channels.
|
|
||||||
* @param[in] mapping <code>const unsigned char[channels]</code>: Mapping from
|
|
||||||
* encoded channels to input channels, as described in
|
|
||||||
* @ref opus_multistream. As an extra constraint, the
|
|
||||||
* multistream encoder does not allow encoding coupled
|
|
||||||
* streams for which one channel is unused since this
|
|
||||||
* is never a good idea.
|
|
||||||
* @param application <tt>int</tt>: The target encoder application.
|
|
||||||
* This must be one of the following:
|
|
||||||
* <dl>
|
|
||||||
* <dt>#OPUS_APPLICATION_VOIP</dt>
|
|
||||||
* <dd>Process signal for improved speech intelligibility.</dd>
|
|
||||||
* <dt>#OPUS_APPLICATION_AUDIO</dt>
|
|
||||||
* <dd>Favor faithfulness to the original input.</dd>
|
|
||||||
* <dt>#OPUS_APPLICATION_RESTRICTED_LOWDELAY</dt>
|
|
||||||
* <dd>Configure the minimum possible coding delay by disabling certain modes
|
|
||||||
* of operation.</dd>
|
|
||||||
* </dl>
|
|
||||||
* @returns #OPUS_OK on success, or an error code (see @ref opus_errorcodes)
|
|
||||||
* on failure.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT int opus_multistream_encoder_init(
|
|
||||||
OpusMSEncoder *st,
|
|
||||||
opus_int32 Fs,
|
|
||||||
int channels,
|
|
||||||
int streams,
|
|
||||||
int coupled_streams,
|
|
||||||
const unsigned char *mapping,
|
|
||||||
int application
|
|
||||||
) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(6);
|
|
||||||
|
|
||||||
OPUS_EXPORT int opus_multistream_surround_encoder_init(
|
|
||||||
OpusMSEncoder *st,
|
|
||||||
opus_int32 Fs,
|
|
||||||
int channels,
|
|
||||||
int mapping_family,
|
|
||||||
int *streams,
|
|
||||||
int *coupled_streams,
|
|
||||||
unsigned char *mapping,
|
|
||||||
int application
|
|
||||||
) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(5) OPUS_ARG_NONNULL(6) OPUS_ARG_NONNULL(7);
|
|
||||||
|
|
||||||
/** Encodes a multistream Opus frame.
|
|
||||||
* @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state.
|
|
||||||
* @param[in] pcm <tt>const opus_int16*</tt>: The input signal as interleaved
|
|
||||||
* samples.
|
|
||||||
* This must contain
|
|
||||||
* <code>frame_size*channels</code>
|
|
||||||
* samples.
|
|
||||||
* @param frame_size <tt>int</tt>: Number of samples per channel in the input
|
|
||||||
* signal.
|
|
||||||
* This must be an Opus frame size for the
|
|
||||||
* encoder's sampling rate.
|
|
||||||
* For example, at 48 kHz the permitted values
|
|
||||||
* are 120, 240, 480, 960, 1920, and 2880.
|
|
||||||
* Passing in a duration of less than 10 ms
|
|
||||||
* (480 samples at 48 kHz) will prevent the
|
|
||||||
* encoder from using the LPC or hybrid modes.
|
|
||||||
* @param[out] data <tt>unsigned char*</tt>: Output payload.
|
|
||||||
* This must contain storage for at
|
|
||||||
* least \a max_data_bytes.
|
|
||||||
* @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
|
|
||||||
* memory for the output
|
|
||||||
* payload. This may be
|
|
||||||
* used to impose an upper limit on
|
|
||||||
* the instant bitrate, but should
|
|
||||||
* not be used as the only bitrate
|
|
||||||
* control. Use #OPUS_SET_BITRATE to
|
|
||||||
* control the bitrate.
|
|
||||||
* @returns The length of the encoded packet (in bytes) on success or a
|
|
||||||
* negative error code (see @ref opus_errorcodes) on failure.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_multistream_encode(
|
|
||||||
OpusMSEncoder *st,
|
|
||||||
const opus_int16 *pcm,
|
|
||||||
int frame_size,
|
|
||||||
unsigned char *data,
|
|
||||||
opus_int32 max_data_bytes
|
|
||||||
) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
|
|
||||||
|
|
||||||
/** Encodes a multistream Opus frame from floating point input.
|
|
||||||
* @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state.
|
|
||||||
* @param[in] pcm <tt>const float*</tt>: The input signal as interleaved
|
|
||||||
* samples with a normal range of
|
|
||||||
* +/-1.0.
|
|
||||||
* Samples with a range beyond +/-1.0
|
|
||||||
* are supported but will be clipped by
|
|
||||||
* decoders using the integer API and
|
|
||||||
* should only be used if it is known
|
|
||||||
* that the far end supports extended
|
|
||||||
* dynamic range.
|
|
||||||
* This must contain
|
|
||||||
* <code>frame_size*channels</code>
|
|
||||||
* samples.
|
|
||||||
* @param frame_size <tt>int</tt>: Number of samples per channel in the input
|
|
||||||
* signal.
|
|
||||||
* This must be an Opus frame size for the
|
|
||||||
* encoder's sampling rate.
|
|
||||||
* For example, at 48 kHz the permitted values
|
|
||||||
* are 120, 240, 480, 960, 1920, and 2880.
|
|
||||||
* Passing in a duration of less than 10 ms
|
|
||||||
* (480 samples at 48 kHz) will prevent the
|
|
||||||
* encoder from using the LPC or hybrid modes.
|
|
||||||
* @param[out] data <tt>unsigned char*</tt>: Output payload.
|
|
||||||
* This must contain storage for at
|
|
||||||
* least \a max_data_bytes.
|
|
||||||
* @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
|
|
||||||
* memory for the output
|
|
||||||
* payload. This may be
|
|
||||||
* used to impose an upper limit on
|
|
||||||
* the instant bitrate, but should
|
|
||||||
* not be used as the only bitrate
|
|
||||||
* control. Use #OPUS_SET_BITRATE to
|
|
||||||
* control the bitrate.
|
|
||||||
* @returns The length of the encoded packet (in bytes) on success or a
|
|
||||||
* negative error code (see @ref opus_errorcodes) on failure.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_multistream_encode_float(
|
|
||||||
OpusMSEncoder *st,
|
|
||||||
const float *pcm,
|
|
||||||
int frame_size,
|
|
||||||
unsigned char *data,
|
|
||||||
opus_int32 max_data_bytes
|
|
||||||
) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
|
|
||||||
|
|
||||||
/** Frees an <code>OpusMSEncoder</code> allocated by
|
|
||||||
* opus_multistream_encoder_create().
|
|
||||||
* @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state to be freed.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT void opus_multistream_encoder_destroy(OpusMSEncoder *st);
|
|
||||||
|
|
||||||
/** Perform a CTL function on a multistream Opus encoder.
|
|
||||||
*
|
|
||||||
* Generally the request and subsequent arguments are generated by a
|
|
||||||
* convenience macro.
|
|
||||||
* @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state.
|
|
||||||
* @param request This and all remaining parameters should be replaced by one
|
|
||||||
* of the convenience macros in @ref opus_genericctls,
|
|
||||||
* @ref opus_encoderctls, or @ref opus_multistream_ctls.
|
|
||||||
* @see opus_genericctls
|
|
||||||
* @see opus_encoderctls
|
|
||||||
* @see opus_multistream_ctls
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT int opus_multistream_encoder_ctl(OpusMSEncoder *st, int request, ...) OPUS_ARG_NONNULL(1);
|
|
||||||
|
|
||||||
/**@}*/
|
|
||||||
|
|
||||||
/**\name Multistream decoder functions */
|
|
||||||
/**@{*/
|
|
||||||
|
|
||||||
/** Gets the size of an <code>OpusMSDecoder</code> structure.
|
|
||||||
* @param streams <tt>int</tt>: The total number of streams coded in the
|
|
||||||
* input.
|
|
||||||
* This must be no more than 255.
|
|
||||||
* @param coupled_streams <tt>int</tt>: Number streams to decode as coupled
|
|
||||||
* (2 channel) streams.
|
|
||||||
* This must be no larger than the total
|
|
||||||
* number of streams.
|
|
||||||
* Additionally, The total number of
|
|
||||||
* coded channels (<code>streams +
|
|
||||||
* coupled_streams</code>) must be no
|
|
||||||
* more than 255.
|
|
||||||
* @returns The size in bytes on success, or a negative error code
|
|
||||||
* (see @ref opus_errorcodes) on error.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_multistream_decoder_get_size(
|
|
||||||
int streams,
|
|
||||||
int coupled_streams
|
|
||||||
);
|
|
||||||
|
|
||||||
/** Allocates and initializes a multistream decoder state.
|
|
||||||
* Call opus_multistream_decoder_destroy() to release
|
|
||||||
* this object when finished.
|
|
||||||
* @param Fs <tt>opus_int32</tt>: Sampling rate to decode at (in Hz).
|
|
||||||
* This must be one of 8000, 12000, 16000,
|
|
||||||
* 24000, or 48000.
|
|
||||||
* @param channels <tt>int</tt>: Number of channels to output.
|
|
||||||
* This must be at most 255.
|
|
||||||
* It may be different from the number of coded
|
|
||||||
* channels (<code>streams +
|
|
||||||
* coupled_streams</code>).
|
|
||||||
* @param streams <tt>int</tt>: The total number of streams coded in the
|
|
||||||
* input.
|
|
||||||
* This must be no more than 255.
|
|
||||||
* @param coupled_streams <tt>int</tt>: Number of streams to decode as coupled
|
|
||||||
* (2 channel) streams.
|
|
||||||
* This must be no larger than the total
|
|
||||||
* number of streams.
|
|
||||||
* Additionally, The total number of
|
|
||||||
* coded channels (<code>streams +
|
|
||||||
* coupled_streams</code>) must be no
|
|
||||||
* more than 255.
|
|
||||||
* @param[in] mapping <code>const unsigned char[channels]</code>: Mapping from
|
|
||||||
* coded channels to output channels, as described in
|
|
||||||
* @ref opus_multistream.
|
|
||||||
* @param[out] error <tt>int *</tt>: Returns #OPUS_OK on success, or an error
|
|
||||||
* code (see @ref opus_errorcodes) on
|
|
||||||
* failure.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusMSDecoder *opus_multistream_decoder_create(
|
|
||||||
opus_int32 Fs,
|
|
||||||
int channels,
|
|
||||||
int streams,
|
|
||||||
int coupled_streams,
|
|
||||||
const unsigned char *mapping,
|
|
||||||
int *error
|
|
||||||
) OPUS_ARG_NONNULL(5);
|
|
||||||
|
|
||||||
/** Intialize a previously allocated decoder state object.
|
|
||||||
* The memory pointed to by \a st must be at least the size returned by
|
|
||||||
* opus_multistream_encoder_get_size().
|
|
||||||
* This is intended for applications which use their own allocator instead of
|
|
||||||
* malloc.
|
|
||||||
* To reset a previously initialized state, use the #OPUS_RESET_STATE CTL.
|
|
||||||
* @see opus_multistream_decoder_create
|
|
||||||
* @see opus_multistream_deocder_get_size
|
|
||||||
* @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state to initialize.
|
|
||||||
* @param Fs <tt>opus_int32</tt>: Sampling rate to decode at (in Hz).
|
|
||||||
* This must be one of 8000, 12000, 16000,
|
|
||||||
* 24000, or 48000.
|
|
||||||
* @param channels <tt>int</tt>: Number of channels to output.
|
|
||||||
* This must be at most 255.
|
|
||||||
* It may be different from the number of coded
|
|
||||||
* channels (<code>streams +
|
|
||||||
* coupled_streams</code>).
|
|
||||||
* @param streams <tt>int</tt>: The total number of streams coded in the
|
|
||||||
* input.
|
|
||||||
* This must be no more than 255.
|
|
||||||
* @param coupled_streams <tt>int</tt>: Number of streams to decode as coupled
|
|
||||||
* (2 channel) streams.
|
|
||||||
* This must be no larger than the total
|
|
||||||
* number of streams.
|
|
||||||
* Additionally, The total number of
|
|
||||||
* coded channels (<code>streams +
|
|
||||||
* coupled_streams</code>) must be no
|
|
||||||
* more than 255.
|
|
||||||
* @param[in] mapping <code>const unsigned char[channels]</code>: Mapping from
|
|
||||||
* coded channels to output channels, as described in
|
|
||||||
* @ref opus_multistream.
|
|
||||||
* @returns #OPUS_OK on success, or an error code (see @ref opus_errorcodes)
|
|
||||||
* on failure.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT int opus_multistream_decoder_init(
|
|
||||||
OpusMSDecoder *st,
|
|
||||||
opus_int32 Fs,
|
|
||||||
int channels,
|
|
||||||
int streams,
|
|
||||||
int coupled_streams,
|
|
||||||
const unsigned char *mapping
|
|
||||||
) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(6);
|
|
||||||
|
|
||||||
/** Decode a multistream Opus packet.
|
|
||||||
* @param st <tt>OpusMSDecoder*</tt>: Multistream decoder state.
|
|
||||||
* @param[in] data <tt>const unsigned char*</tt>: Input payload.
|
|
||||||
* Use a <code>NULL</code>
|
|
||||||
* pointer to indicate packet
|
|
||||||
* loss.
|
|
||||||
* @param len <tt>opus_int32</tt>: Number of bytes in payload.
|
|
||||||
* @param[out] pcm <tt>opus_int16*</tt>: Output signal, with interleaved
|
|
||||||
* samples.
|
|
||||||
* This must contain room for
|
|
||||||
* <code>frame_size*channels</code>
|
|
||||||
* samples.
|
|
||||||
* @param frame_size <tt>int</tt>: The number of samples per channel of
|
|
||||||
* available space in \a pcm.
|
|
||||||
* If this is less than the maximum packet duration
|
|
||||||
* (120 ms; 5760 for 48kHz), this function will not be capable
|
|
||||||
* of decoding some packets. In the case of PLC (data==NULL)
|
|
||||||
* or FEC (decode_fec=1), then frame_size needs to be exactly
|
|
||||||
* the duration of audio that is missing, otherwise the
|
|
||||||
* decoder will not be in the optimal state to decode the
|
|
||||||
* next incoming packet. For the PLC and FEC cases, frame_size
|
|
||||||
* <b>must</b> be a multiple of 2.5 ms.
|
|
||||||
* @param decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band
|
|
||||||
* forward error correction data be decoded.
|
|
||||||
* If no such data is available, the frame is
|
|
||||||
* decoded as if it were lost.
|
|
||||||
* @returns Number of samples decoded on success or a negative error code
|
|
||||||
* (see @ref opus_errorcodes) on failure.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_multistream_decode(
|
|
||||||
OpusMSDecoder *st,
|
|
||||||
const unsigned char *data,
|
|
||||||
opus_int32 len,
|
|
||||||
opus_int16 *pcm,
|
|
||||||
int frame_size,
|
|
||||||
int decode_fec
|
|
||||||
) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
|
|
||||||
|
|
||||||
/** Decode a multistream Opus packet with floating point output.
|
|
||||||
* @param st <tt>OpusMSDecoder*</tt>: Multistream decoder state.
|
|
||||||
* @param[in] data <tt>const unsigned char*</tt>: Input payload.
|
|
||||||
* Use a <code>NULL</code>
|
|
||||||
* pointer to indicate packet
|
|
||||||
* loss.
|
|
||||||
* @param len <tt>opus_int32</tt>: Number of bytes in payload.
|
|
||||||
* @param[out] pcm <tt>opus_int16*</tt>: Output signal, with interleaved
|
|
||||||
* samples.
|
|
||||||
* This must contain room for
|
|
||||||
* <code>frame_size*channels</code>
|
|
||||||
* samples.
|
|
||||||
* @param frame_size <tt>int</tt>: The number of samples per channel of
|
|
||||||
* available space in \a pcm.
|
|
||||||
* If this is less than the maximum packet duration
|
|
||||||
* (120 ms; 5760 for 48kHz), this function will not be capable
|
|
||||||
* of decoding some packets. In the case of PLC (data==NULL)
|
|
||||||
* or FEC (decode_fec=1), then frame_size needs to be exactly
|
|
||||||
* the duration of audio that is missing, otherwise the
|
|
||||||
* decoder will not be in the optimal state to decode the
|
|
||||||
* next incoming packet. For the PLC and FEC cases, frame_size
|
|
||||||
* <b>must</b> be a multiple of 2.5 ms.
|
|
||||||
* @param decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band
|
|
||||||
* forward error correction data be decoded.
|
|
||||||
* If no such data is available, the frame is
|
|
||||||
* decoded as if it were lost.
|
|
||||||
* @returns Number of samples decoded on success or a negative error code
|
|
||||||
* (see @ref opus_errorcodes) on failure.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_multistream_decode_float(
|
|
||||||
OpusMSDecoder *st,
|
|
||||||
const unsigned char *data,
|
|
||||||
opus_int32 len,
|
|
||||||
float *pcm,
|
|
||||||
int frame_size,
|
|
||||||
int decode_fec
|
|
||||||
) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
|
|
||||||
|
|
||||||
/** Perform a CTL function on a multistream Opus decoder.
|
|
||||||
*
|
|
||||||
* Generally the request and subsequent arguments are generated by a
|
|
||||||
* convenience macro.
|
|
||||||
* @param st <tt>OpusMSDecoder*</tt>: Multistream decoder state.
|
|
||||||
* @param request This and all remaining parameters should be replaced by one
|
|
||||||
* of the convenience macros in @ref opus_genericctls,
|
|
||||||
* @ref opus_decoderctls, or @ref opus_multistream_ctls.
|
|
||||||
* @see opus_genericctls
|
|
||||||
* @see opus_decoderctls
|
|
||||||
* @see opus_multistream_ctls
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT int opus_multistream_decoder_ctl(OpusMSDecoder *st, int request, ...) OPUS_ARG_NONNULL(1);
|
|
||||||
|
|
||||||
/** Frees an <code>OpusMSDecoder</code> allocated by
|
|
||||||
* opus_multistream_decoder_create().
|
|
||||||
* @param st <tt>OpusMSDecoder</tt>: Multistream decoder state to be freed.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT void opus_multistream_decoder_destroy(OpusMSDecoder *st);
|
|
||||||
|
|
||||||
/**@}*/
|
|
||||||
|
|
||||||
/**@}*/
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* OPUS_MULTISTREAM_H */
|
|
|
@ -1,568 +0,0 @@
|
||||||
/* Copyright (c) 2017 Google Inc.
|
|
||||||
Written by Andrew Allen */
|
|
||||||
/*
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
|
||||||
modification, are permitted provided that the following conditions
|
|
||||||
are met:
|
|
||||||
|
|
||||||
- Redistributions of source code must retain the above copyright
|
|
||||||
notice, this list of conditions and the following disclaimer.
|
|
||||||
|
|
||||||
- Redistributions in binary form must reproduce the above copyright
|
|
||||||
notice, this list of conditions and the following disclaimer in the
|
|
||||||
documentation and/or other materials provided with the distribution.
|
|
||||||
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
||||||
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
||||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
||||||
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
|
|
||||||
OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
|
||||||
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
|
||||||
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
|
||||||
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
|
||||||
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @file opus_projection.h
|
|
||||||
* @brief Opus projection reference API
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef OPUS_PROJECTION_H
|
|
||||||
#define OPUS_PROJECTION_H
|
|
||||||
|
|
||||||
#include "opus_multistream.h"
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/** @cond OPUS_INTERNAL_DOC */
|
|
||||||
|
|
||||||
/** These are the actual encoder and decoder CTL ID numbers.
|
|
||||||
* They should not be used directly by applications.c
|
|
||||||
* In general, SETs should be even and GETs should be odd.*/
|
|
||||||
/**@{*/
|
|
||||||
#define OPUS_PROJECTION_GET_DEMIXING_MATRIX_GAIN_REQUEST 6001
|
|
||||||
#define OPUS_PROJECTION_GET_DEMIXING_MATRIX_SIZE_REQUEST 6003
|
|
||||||
#define OPUS_PROJECTION_GET_DEMIXING_MATRIX_REQUEST 6005
|
|
||||||
/**@}*/
|
|
||||||
|
|
||||||
|
|
||||||
/** @endcond */
|
|
||||||
|
|
||||||
/** @defgroup opus_projection_ctls Projection specific encoder and decoder CTLs
|
|
||||||
*
|
|
||||||
* These are convenience macros that are specific to the
|
|
||||||
* opus_projection_encoder_ctl() and opus_projection_decoder_ctl()
|
|
||||||
* interface.
|
|
||||||
* The CTLs from @ref opus_genericctls, @ref opus_encoderctls,
|
|
||||||
* @ref opus_decoderctls, and @ref opus_multistream_ctls may be applied to a
|
|
||||||
* projection encoder or decoder as well.
|
|
||||||
*/
|
|
||||||
/**@{*/
|
|
||||||
|
|
||||||
/** Gets the gain (in dB. S7.8-format) of the demixing matrix from the encoder.
|
|
||||||
* @param[out] x <tt>opus_int32 *</tt>: Returns the gain (in dB. S7.8-format)
|
|
||||||
* of the demixing matrix.
|
|
||||||
* @hideinitializer
|
|
||||||
*/
|
|
||||||
#define OPUS_PROJECTION_GET_DEMIXING_MATRIX_GAIN(x) OPUS_PROJECTION_GET_DEMIXING_MATRIX_GAIN_REQUEST, __opus_check_int_ptr(x)
|
|
||||||
|
|
||||||
|
|
||||||
/** Gets the size in bytes of the demixing matrix from the encoder.
|
|
||||||
* @param[out] x <tt>opus_int32 *</tt>: Returns the size in bytes of the
|
|
||||||
* demixing matrix.
|
|
||||||
* @hideinitializer
|
|
||||||
*/
|
|
||||||
#define OPUS_PROJECTION_GET_DEMIXING_MATRIX_SIZE(x) OPUS_PROJECTION_GET_DEMIXING_MATRIX_SIZE_REQUEST, __opus_check_int_ptr(x)
|
|
||||||
|
|
||||||
|
|
||||||
/** Copies the demixing matrix to the supplied pointer location.
|
|
||||||
* @param[out] x <tt>unsigned char *</tt>: Returns the demixing matrix to the
|
|
||||||
* supplied pointer location.
|
|
||||||
* @param y <tt>opus_int32</tt>: The size in bytes of the reserved memory at the
|
|
||||||
* pointer location.
|
|
||||||
* @hideinitializer
|
|
||||||
*/
|
|
||||||
#define OPUS_PROJECTION_GET_DEMIXING_MATRIX(x,y) OPUS_PROJECTION_GET_DEMIXING_MATRIX_REQUEST, x, __opus_check_int(y)
|
|
||||||
|
|
||||||
|
|
||||||
/**@}*/
|
|
||||||
|
|
||||||
/** Opus projection encoder state.
|
|
||||||
* This contains the complete state of a projection Opus encoder.
|
|
||||||
* It is position independent and can be freely copied.
|
|
||||||
* @see opus_projection_ambisonics_encoder_create
|
|
||||||
*/
|
|
||||||
typedef struct OpusProjectionEncoder OpusProjectionEncoder;
|
|
||||||
|
|
||||||
|
|
||||||
/** Opus projection decoder state.
|
|
||||||
* This contains the complete state of a projection Opus decoder.
|
|
||||||
* It is position independent and can be freely copied.
|
|
||||||
* @see opus_projection_decoder_create
|
|
||||||
* @see opus_projection_decoder_init
|
|
||||||
*/
|
|
||||||
typedef struct OpusProjectionDecoder OpusProjectionDecoder;
|
|
||||||
|
|
||||||
|
|
||||||
/**\name Projection encoder functions */
|
|
||||||
/**@{*/
|
|
||||||
|
|
||||||
/** Gets the size of an OpusProjectionEncoder structure.
|
|
||||||
* @param channels <tt>int</tt>: The total number of input channels to encode.
|
|
||||||
* This must be no more than 255.
|
|
||||||
* @param mapping_family <tt>int</tt>: The mapping family to use for selecting
|
|
||||||
* the appropriate projection.
|
|
||||||
* @returns The size in bytes on success, or a negative error code
|
|
||||||
* (see @ref opus_errorcodes) on error.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_projection_ambisonics_encoder_get_size(
|
|
||||||
int channels,
|
|
||||||
int mapping_family
|
|
||||||
);
|
|
||||||
|
|
||||||
|
|
||||||
/** Allocates and initializes a projection encoder state.
|
|
||||||
* Call opus_projection_encoder_destroy() to release
|
|
||||||
* this object when finished.
|
|
||||||
* @param Fs <tt>opus_int32</tt>: Sampling rate of the input signal (in Hz).
|
|
||||||
* This must be one of 8000, 12000, 16000,
|
|
||||||
* 24000, or 48000.
|
|
||||||
* @param channels <tt>int</tt>: Number of channels in the input signal.
|
|
||||||
* This must be at most 255.
|
|
||||||
* It may be greater than the number of
|
|
||||||
* coded channels (<code>streams +
|
|
||||||
* coupled_streams</code>).
|
|
||||||
* @param mapping_family <tt>int</tt>: The mapping family to use for selecting
|
|
||||||
* the appropriate projection.
|
|
||||||
* @param[out] streams <tt>int *</tt>: The total number of streams that will
|
|
||||||
* be encoded from the input.
|
|
||||||
* @param[out] coupled_streams <tt>int *</tt>: Number of coupled (2 channel)
|
|
||||||
* streams that will be encoded from the input.
|
|
||||||
* @param application <tt>int</tt>: The target encoder application.
|
|
||||||
* This must be one of the following:
|
|
||||||
* <dl>
|
|
||||||
* <dt>#OPUS_APPLICATION_VOIP</dt>
|
|
||||||
* <dd>Process signal for improved speech intelligibility.</dd>
|
|
||||||
* <dt>#OPUS_APPLICATION_AUDIO</dt>
|
|
||||||
* <dd>Favor faithfulness to the original input.</dd>
|
|
||||||
* <dt>#OPUS_APPLICATION_RESTRICTED_LOWDELAY</dt>
|
|
||||||
* <dd>Configure the minimum possible coding delay by disabling certain modes
|
|
||||||
* of operation.</dd>
|
|
||||||
* </dl>
|
|
||||||
* @param[out] error <tt>int *</tt>: Returns #OPUS_OK on success, or an error
|
|
||||||
* code (see @ref opus_errorcodes) on
|
|
||||||
* failure.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusProjectionEncoder *opus_projection_ambisonics_encoder_create(
|
|
||||||
opus_int32 Fs,
|
|
||||||
int channels,
|
|
||||||
int mapping_family,
|
|
||||||
int *streams,
|
|
||||||
int *coupled_streams,
|
|
||||||
int application,
|
|
||||||
int *error
|
|
||||||
) OPUS_ARG_NONNULL(4) OPUS_ARG_NONNULL(5);
|
|
||||||
|
|
||||||
|
|
||||||
/** Initialize a previously allocated projection encoder state.
|
|
||||||
* The memory pointed to by \a st must be at least the size returned by
|
|
||||||
* opus_projection_ambisonics_encoder_get_size().
|
|
||||||
* This is intended for applications which use their own allocator instead of
|
|
||||||
* malloc.
|
|
||||||
* To reset a previously initialized state, use the #OPUS_RESET_STATE CTL.
|
|
||||||
* @see opus_projection_ambisonics_encoder_create
|
|
||||||
* @see opus_projection_ambisonics_encoder_get_size
|
|
||||||
* @param st <tt>OpusProjectionEncoder*</tt>: Projection encoder state to initialize.
|
|
||||||
* @param Fs <tt>opus_int32</tt>: Sampling rate of the input signal (in Hz).
|
|
||||||
* This must be one of 8000, 12000, 16000,
|
|
||||||
* 24000, or 48000.
|
|
||||||
* @param channels <tt>int</tt>: Number of channels in the input signal.
|
|
||||||
* This must be at most 255.
|
|
||||||
* It may be greater than the number of
|
|
||||||
* coded channels (<code>streams +
|
|
||||||
* coupled_streams</code>).
|
|
||||||
* @param streams <tt>int</tt>: The total number of streams to encode from the
|
|
||||||
* input.
|
|
||||||
* This must be no more than the number of channels.
|
|
||||||
* @param coupled_streams <tt>int</tt>: Number of coupled (2 channel) streams
|
|
||||||
* to encode.
|
|
||||||
* This must be no larger than the total
|
|
||||||
* number of streams.
|
|
||||||
* Additionally, The total number of
|
|
||||||
* encoded channels (<code>streams +
|
|
||||||
* coupled_streams</code>) must be no
|
|
||||||
* more than the number of input channels.
|
|
||||||
* @param application <tt>int</tt>: The target encoder application.
|
|
||||||
* This must be one of the following:
|
|
||||||
* <dl>
|
|
||||||
* <dt>#OPUS_APPLICATION_VOIP</dt>
|
|
||||||
* <dd>Process signal for improved speech intelligibility.</dd>
|
|
||||||
* <dt>#OPUS_APPLICATION_AUDIO</dt>
|
|
||||||
* <dd>Favor faithfulness to the original input.</dd>
|
|
||||||
* <dt>#OPUS_APPLICATION_RESTRICTED_LOWDELAY</dt>
|
|
||||||
* <dd>Configure the minimum possible coding delay by disabling certain modes
|
|
||||||
* of operation.</dd>
|
|
||||||
* </dl>
|
|
||||||
* @returns #OPUS_OK on success, or an error code (see @ref opus_errorcodes)
|
|
||||||
* on failure.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT int opus_projection_ambisonics_encoder_init(
|
|
||||||
OpusProjectionEncoder *st,
|
|
||||||
opus_int32 Fs,
|
|
||||||
int channels,
|
|
||||||
int mapping_family,
|
|
||||||
int *streams,
|
|
||||||
int *coupled_streams,
|
|
||||||
int application
|
|
||||||
) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(5) OPUS_ARG_NONNULL(6);
|
|
||||||
|
|
||||||
|
|
||||||
/** Encodes a projection Opus frame.
|
|
||||||
* @param st <tt>OpusProjectionEncoder*</tt>: Projection encoder state.
|
|
||||||
* @param[in] pcm <tt>const opus_int16*</tt>: The input signal as interleaved
|
|
||||||
* samples.
|
|
||||||
* This must contain
|
|
||||||
* <code>frame_size*channels</code>
|
|
||||||
* samples.
|
|
||||||
* @param frame_size <tt>int</tt>: Number of samples per channel in the input
|
|
||||||
* signal.
|
|
||||||
* This must be an Opus frame size for the
|
|
||||||
* encoder's sampling rate.
|
|
||||||
* For example, at 48 kHz the permitted values
|
|
||||||
* are 120, 240, 480, 960, 1920, and 2880.
|
|
||||||
* Passing in a duration of less than 10 ms
|
|
||||||
* (480 samples at 48 kHz) will prevent the
|
|
||||||
* encoder from using the LPC or hybrid modes.
|
|
||||||
* @param[out] data <tt>unsigned char*</tt>: Output payload.
|
|
||||||
* This must contain storage for at
|
|
||||||
* least \a max_data_bytes.
|
|
||||||
* @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
|
|
||||||
* memory for the output
|
|
||||||
* payload. This may be
|
|
||||||
* used to impose an upper limit on
|
|
||||||
* the instant bitrate, but should
|
|
||||||
* not be used as the only bitrate
|
|
||||||
* control. Use #OPUS_SET_BITRATE to
|
|
||||||
* control the bitrate.
|
|
||||||
* @returns The length of the encoded packet (in bytes) on success or a
|
|
||||||
* negative error code (see @ref opus_errorcodes) on failure.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_projection_encode(
|
|
||||||
OpusProjectionEncoder *st,
|
|
||||||
const opus_int16 *pcm,
|
|
||||||
int frame_size,
|
|
||||||
unsigned char *data,
|
|
||||||
opus_int32 max_data_bytes
|
|
||||||
) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
|
|
||||||
|
|
||||||
|
|
||||||
/** Encodes a projection Opus frame from floating point input.
|
|
||||||
* @param st <tt>OpusProjectionEncoder*</tt>: Projection encoder state.
|
|
||||||
* @param[in] pcm <tt>const float*</tt>: The input signal as interleaved
|
|
||||||
* samples with a normal range of
|
|
||||||
* +/-1.0.
|
|
||||||
* Samples with a range beyond +/-1.0
|
|
||||||
* are supported but will be clipped by
|
|
||||||
* decoders using the integer API and
|
|
||||||
* should only be used if it is known
|
|
||||||
* that the far end supports extended
|
|
||||||
* dynamic range.
|
|
||||||
* This must contain
|
|
||||||
* <code>frame_size*channels</code>
|
|
||||||
* samples.
|
|
||||||
* @param frame_size <tt>int</tt>: Number of samples per channel in the input
|
|
||||||
* signal.
|
|
||||||
* This must be an Opus frame size for the
|
|
||||||
* encoder's sampling rate.
|
|
||||||
* For example, at 48 kHz the permitted values
|
|
||||||
* are 120, 240, 480, 960, 1920, and 2880.
|
|
||||||
* Passing in a duration of less than 10 ms
|
|
||||||
* (480 samples at 48 kHz) will prevent the
|
|
||||||
* encoder from using the LPC or hybrid modes.
|
|
||||||
* @param[out] data <tt>unsigned char*</tt>: Output payload.
|
|
||||||
* This must contain storage for at
|
|
||||||
* least \a max_data_bytes.
|
|
||||||
* @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
|
|
||||||
* memory for the output
|
|
||||||
* payload. This may be
|
|
||||||
* used to impose an upper limit on
|
|
||||||
* the instant bitrate, but should
|
|
||||||
* not be used as the only bitrate
|
|
||||||
* control. Use #OPUS_SET_BITRATE to
|
|
||||||
* control the bitrate.
|
|
||||||
* @returns The length of the encoded packet (in bytes) on success or a
|
|
||||||
* negative error code (see @ref opus_errorcodes) on failure.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_projection_encode_float(
|
|
||||||
OpusProjectionEncoder *st,
|
|
||||||
const float *pcm,
|
|
||||||
int frame_size,
|
|
||||||
unsigned char *data,
|
|
||||||
opus_int32 max_data_bytes
|
|
||||||
) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
|
|
||||||
|
|
||||||
|
|
||||||
/** Frees an <code>OpusProjectionEncoder</code> allocated by
|
|
||||||
* opus_projection_ambisonics_encoder_create().
|
|
||||||
* @param st <tt>OpusProjectionEncoder*</tt>: Projection encoder state to be freed.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT void opus_projection_encoder_destroy(OpusProjectionEncoder *st);
|
|
||||||
|
|
||||||
|
|
||||||
/** Perform a CTL function on a projection Opus encoder.
|
|
||||||
*
|
|
||||||
* Generally the request and subsequent arguments are generated by a
|
|
||||||
* convenience macro.
|
|
||||||
* @param st <tt>OpusProjectionEncoder*</tt>: Projection encoder state.
|
|
||||||
* @param request This and all remaining parameters should be replaced by one
|
|
||||||
* of the convenience macros in @ref opus_genericctls,
|
|
||||||
* @ref opus_encoderctls, @ref opus_multistream_ctls, or
|
|
||||||
* @ref opus_projection_ctls
|
|
||||||
* @see opus_genericctls
|
|
||||||
* @see opus_encoderctls
|
|
||||||
* @see opus_multistream_ctls
|
|
||||||
* @see opus_projection_ctls
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT int opus_projection_encoder_ctl(OpusProjectionEncoder *st, int request, ...) OPUS_ARG_NONNULL(1);
|
|
||||||
|
|
||||||
|
|
||||||
/**@}*/
|
|
||||||
|
|
||||||
/**\name Projection decoder functions */
|
|
||||||
/**@{*/
|
|
||||||
|
|
||||||
/** Gets the size of an <code>OpusProjectionDecoder</code> structure.
|
|
||||||
* @param channels <tt>int</tt>: The total number of output channels.
|
|
||||||
* This must be no more than 255.
|
|
||||||
* @param streams <tt>int</tt>: The total number of streams coded in the
|
|
||||||
* input.
|
|
||||||
* This must be no more than 255.
|
|
||||||
* @param coupled_streams <tt>int</tt>: Number streams to decode as coupled
|
|
||||||
* (2 channel) streams.
|
|
||||||
* This must be no larger than the total
|
|
||||||
* number of streams.
|
|
||||||
* Additionally, The total number of
|
|
||||||
* coded channels (<code>streams +
|
|
||||||
* coupled_streams</code>) must be no
|
|
||||||
* more than 255.
|
|
||||||
* @returns The size in bytes on success, or a negative error code
|
|
||||||
* (see @ref opus_errorcodes) on error.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_projection_decoder_get_size(
|
|
||||||
int channels,
|
|
||||||
int streams,
|
|
||||||
int coupled_streams
|
|
||||||
);
|
|
||||||
|
|
||||||
|
|
||||||
/** Allocates and initializes a projection decoder state.
|
|
||||||
* Call opus_projection_decoder_destroy() to release
|
|
||||||
* this object when finished.
|
|
||||||
* @param Fs <tt>opus_int32</tt>: Sampling rate to decode at (in Hz).
|
|
||||||
* This must be one of 8000, 12000, 16000,
|
|
||||||
* 24000, or 48000.
|
|
||||||
* @param channels <tt>int</tt>: Number of channels to output.
|
|
||||||
* This must be at most 255.
|
|
||||||
* It may be different from the number of coded
|
|
||||||
* channels (<code>streams +
|
|
||||||
* coupled_streams</code>).
|
|
||||||
* @param streams <tt>int</tt>: The total number of streams coded in the
|
|
||||||
* input.
|
|
||||||
* This must be no more than 255.
|
|
||||||
* @param coupled_streams <tt>int</tt>: Number of streams to decode as coupled
|
|
||||||
* (2 channel) streams.
|
|
||||||
* This must be no larger than the total
|
|
||||||
* number of streams.
|
|
||||||
* Additionally, The total number of
|
|
||||||
* coded channels (<code>streams +
|
|
||||||
* coupled_streams</code>) must be no
|
|
||||||
* more than 255.
|
|
||||||
* @param[in] demixing_matrix <tt>const unsigned char[demixing_matrix_size]</tt>: Demixing matrix
|
|
||||||
* that mapping from coded channels to output channels,
|
|
||||||
* as described in @ref opus_projection and
|
|
||||||
* @ref opus_projection_ctls.
|
|
||||||
* @param demixing_matrix_size <tt>opus_int32</tt>: The size in bytes of the
|
|
||||||
* demixing matrix, as
|
|
||||||
* described in @ref
|
|
||||||
* opus_projection_ctls.
|
|
||||||
* @param[out] error <tt>int *</tt>: Returns #OPUS_OK on success, or an error
|
|
||||||
* code (see @ref opus_errorcodes) on
|
|
||||||
* failure.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusProjectionDecoder *opus_projection_decoder_create(
|
|
||||||
opus_int32 Fs,
|
|
||||||
int channels,
|
|
||||||
int streams,
|
|
||||||
int coupled_streams,
|
|
||||||
unsigned char *demixing_matrix,
|
|
||||||
opus_int32 demixing_matrix_size,
|
|
||||||
int *error
|
|
||||||
) OPUS_ARG_NONNULL(5);
|
|
||||||
|
|
||||||
|
|
||||||
/** Intialize a previously allocated projection decoder state object.
|
|
||||||
* The memory pointed to by \a st must be at least the size returned by
|
|
||||||
* opus_projection_decoder_get_size().
|
|
||||||
* This is intended for applications which use their own allocator instead of
|
|
||||||
* malloc.
|
|
||||||
* To reset a previously initialized state, use the #OPUS_RESET_STATE CTL.
|
|
||||||
* @see opus_projection_decoder_create
|
|
||||||
* @see opus_projection_deocder_get_size
|
|
||||||
* @param st <tt>OpusProjectionDecoder*</tt>: Projection encoder state to initialize.
|
|
||||||
* @param Fs <tt>opus_int32</tt>: Sampling rate to decode at (in Hz).
|
|
||||||
* This must be one of 8000, 12000, 16000,
|
|
||||||
* 24000, or 48000.
|
|
||||||
* @param channels <tt>int</tt>: Number of channels to output.
|
|
||||||
* This must be at most 255.
|
|
||||||
* It may be different from the number of coded
|
|
||||||
* channels (<code>streams +
|
|
||||||
* coupled_streams</code>).
|
|
||||||
* @param streams <tt>int</tt>: The total number of streams coded in the
|
|
||||||
* input.
|
|
||||||
* This must be no more than 255.
|
|
||||||
* @param coupled_streams <tt>int</tt>: Number of streams to decode as coupled
|
|
||||||
* (2 channel) streams.
|
|
||||||
* This must be no larger than the total
|
|
||||||
* number of streams.
|
|
||||||
* Additionally, The total number of
|
|
||||||
* coded channels (<code>streams +
|
|
||||||
* coupled_streams</code>) must be no
|
|
||||||
* more than 255.
|
|
||||||
* @param[in] demixing_matrix <tt>const unsigned char[demixing_matrix_size]</tt>: Demixing matrix
|
|
||||||
* that mapping from coded channels to output channels,
|
|
||||||
* as described in @ref opus_projection and
|
|
||||||
* @ref opus_projection_ctls.
|
|
||||||
* @param demixing_matrix_size <tt>opus_int32</tt>: The size in bytes of the
|
|
||||||
* demixing matrix, as
|
|
||||||
* described in @ref
|
|
||||||
* opus_projection_ctls.
|
|
||||||
* @returns #OPUS_OK on success, or an error code (see @ref opus_errorcodes)
|
|
||||||
* on failure.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT int opus_projection_decoder_init(
|
|
||||||
OpusProjectionDecoder *st,
|
|
||||||
opus_int32 Fs,
|
|
||||||
int channels,
|
|
||||||
int streams,
|
|
||||||
int coupled_streams,
|
|
||||||
unsigned char *demixing_matrix,
|
|
||||||
opus_int32 demixing_matrix_size
|
|
||||||
) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(6);
|
|
||||||
|
|
||||||
|
|
||||||
/** Decode a projection Opus packet.
|
|
||||||
* @param st <tt>OpusProjectionDecoder*</tt>: Projection decoder state.
|
|
||||||
* @param[in] data <tt>const unsigned char*</tt>: Input payload.
|
|
||||||
* Use a <code>NULL</code>
|
|
||||||
* pointer to indicate packet
|
|
||||||
* loss.
|
|
||||||
* @param len <tt>opus_int32</tt>: Number of bytes in payload.
|
|
||||||
* @param[out] pcm <tt>opus_int16*</tt>: Output signal, with interleaved
|
|
||||||
* samples.
|
|
||||||
* This must contain room for
|
|
||||||
* <code>frame_size*channels</code>
|
|
||||||
* samples.
|
|
||||||
* @param frame_size <tt>int</tt>: The number of samples per channel of
|
|
||||||
* available space in \a pcm.
|
|
||||||
* If this is less than the maximum packet duration
|
|
||||||
* (120 ms; 5760 for 48kHz), this function will not be capable
|
|
||||||
* of decoding some packets. In the case of PLC (data==NULL)
|
|
||||||
* or FEC (decode_fec=1), then frame_size needs to be exactly
|
|
||||||
* the duration of audio that is missing, otherwise the
|
|
||||||
* decoder will not be in the optimal state to decode the
|
|
||||||
* next incoming packet. For the PLC and FEC cases, frame_size
|
|
||||||
* <b>must</b> be a multiple of 2.5 ms.
|
|
||||||
* @param decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band
|
|
||||||
* forward error correction data be decoded.
|
|
||||||
* If no such data is available, the frame is
|
|
||||||
* decoded as if it were lost.
|
|
||||||
* @returns Number of samples decoded on success or a negative error code
|
|
||||||
* (see @ref opus_errorcodes) on failure.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_projection_decode(
|
|
||||||
OpusProjectionDecoder *st,
|
|
||||||
const unsigned char *data,
|
|
||||||
opus_int32 len,
|
|
||||||
opus_int16 *pcm,
|
|
||||||
int frame_size,
|
|
||||||
int decode_fec
|
|
||||||
) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
|
|
||||||
|
|
||||||
|
|
||||||
/** Decode a projection Opus packet with floating point output.
|
|
||||||
* @param st <tt>OpusProjectionDecoder*</tt>: Projection decoder state.
|
|
||||||
* @param[in] data <tt>const unsigned char*</tt>: Input payload.
|
|
||||||
* Use a <code>NULL</code>
|
|
||||||
* pointer to indicate packet
|
|
||||||
* loss.
|
|
||||||
* @param len <tt>opus_int32</tt>: Number of bytes in payload.
|
|
||||||
* @param[out] pcm <tt>opus_int16*</tt>: Output signal, with interleaved
|
|
||||||
* samples.
|
|
||||||
* This must contain room for
|
|
||||||
* <code>frame_size*channels</code>
|
|
||||||
* samples.
|
|
||||||
* @param frame_size <tt>int</tt>: The number of samples per channel of
|
|
||||||
* available space in \a pcm.
|
|
||||||
* If this is less than the maximum packet duration
|
|
||||||
* (120 ms; 5760 for 48kHz), this function will not be capable
|
|
||||||
* of decoding some packets. In the case of PLC (data==NULL)
|
|
||||||
* or FEC (decode_fec=1), then frame_size needs to be exactly
|
|
||||||
* the duration of audio that is missing, otherwise the
|
|
||||||
* decoder will not be in the optimal state to decode the
|
|
||||||
* next incoming packet. For the PLC and FEC cases, frame_size
|
|
||||||
* <b>must</b> be a multiple of 2.5 ms.
|
|
||||||
* @param decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band
|
|
||||||
* forward error correction data be decoded.
|
|
||||||
* If no such data is available, the frame is
|
|
||||||
* decoded as if it were lost.
|
|
||||||
* @returns Number of samples decoded on success or a negative error code
|
|
||||||
* (see @ref opus_errorcodes) on failure.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_projection_decode_float(
|
|
||||||
OpusProjectionDecoder *st,
|
|
||||||
const unsigned char *data,
|
|
||||||
opus_int32 len,
|
|
||||||
float *pcm,
|
|
||||||
int frame_size,
|
|
||||||
int decode_fec
|
|
||||||
) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
|
|
||||||
|
|
||||||
|
|
||||||
/** Perform a CTL function on a projection Opus decoder.
|
|
||||||
*
|
|
||||||
* Generally the request and subsequent arguments are generated by a
|
|
||||||
* convenience macro.
|
|
||||||
* @param st <tt>OpusProjectionDecoder*</tt>: Projection decoder state.
|
|
||||||
* @param request This and all remaining parameters should be replaced by one
|
|
||||||
* of the convenience macros in @ref opus_genericctls,
|
|
||||||
* @ref opus_decoderctls, @ref opus_multistream_ctls, or
|
|
||||||
* @ref opus_projection_ctls.
|
|
||||||
* @see opus_genericctls
|
|
||||||
* @see opus_decoderctls
|
|
||||||
* @see opus_multistream_ctls
|
|
||||||
* @see opus_projection_ctls
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT int opus_projection_decoder_ctl(OpusProjectionDecoder *st, int request, ...) OPUS_ARG_NONNULL(1);
|
|
||||||
|
|
||||||
|
|
||||||
/** Frees an <code>OpusProjectionDecoder</code> allocated by
|
|
||||||
* opus_projection_decoder_create().
|
|
||||||
* @param st <tt>OpusProjectionDecoder</tt>: Projection decoder state to be freed.
|
|
||||||
*/
|
|
||||||
OPUS_EXPORT void opus_projection_decoder_destroy(OpusProjectionDecoder *st);
|
|
||||||
|
|
||||||
|
|
||||||
/**@}*/
|
|
||||||
|
|
||||||
/**@}*/
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* OPUS_PROJECTION_H */
|
|
|
@ -1,166 +0,0 @@
|
||||||
/* (C) COPYRIGHT 1994-2002 Xiph.Org Foundation */
|
|
||||||
/* Modified by Jean-Marc Valin */
|
|
||||||
/*
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
|
||||||
modification, are permitted provided that the following conditions
|
|
||||||
are met:
|
|
||||||
|
|
||||||
- Redistributions of source code must retain the above copyright
|
|
||||||
notice, this list of conditions and the following disclaimer.
|
|
||||||
|
|
||||||
- Redistributions in binary form must reproduce the above copyright
|
|
||||||
notice, this list of conditions and the following disclaimer in the
|
|
||||||
documentation and/or other materials provided with the distribution.
|
|
||||||
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
||||||
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
||||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
||||||
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
|
|
||||||
OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
|
||||||
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
|
||||||
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
|
||||||
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
|
||||||
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
/* opus_types.h based on ogg_types.h from libogg */
|
|
||||||
|
|
||||||
/**
|
|
||||||
@file opus_types.h
|
|
||||||
@brief Opus reference implementation types
|
|
||||||
*/
|
|
||||||
#ifndef OPUS_TYPES_H
|
|
||||||
#define OPUS_TYPES_H
|
|
||||||
|
|
||||||
#define opus_int int /* used for counters etc; at least 16 bits */
|
|
||||||
#define opus_int64 long long
|
|
||||||
#define opus_int8 signed char
|
|
||||||
|
|
||||||
#define opus_uint unsigned int /* used for counters etc; at least 16 bits */
|
|
||||||
#define opus_uint64 unsigned long long
|
|
||||||
#define opus_uint8 unsigned char
|
|
||||||
|
|
||||||
/* Use the real stdint.h if it's there (taken from Paul Hsieh's pstdint.h) */
|
|
||||||
#if (defined(__STDC__) && __STDC__ && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || (defined(__GNUC__) && (defined(_STDINT_H) || defined(_STDINT_H_)) || defined (HAVE_STDINT_H))
|
|
||||||
#include <stdint.h>
|
|
||||||
# undef opus_int64
|
|
||||||
# undef opus_int8
|
|
||||||
# undef opus_uint64
|
|
||||||
# undef opus_uint8
|
|
||||||
typedef int8_t opus_int8;
|
|
||||||
typedef uint8_t opus_uint8;
|
|
||||||
typedef int16_t opus_int16;
|
|
||||||
typedef uint16_t opus_uint16;
|
|
||||||
typedef int32_t opus_int32;
|
|
||||||
typedef uint32_t opus_uint32;
|
|
||||||
typedef int64_t opus_int64;
|
|
||||||
typedef uint64_t opus_uint64;
|
|
||||||
#elif defined(_WIN32)
|
|
||||||
|
|
||||||
# if defined(__CYGWIN__)
|
|
||||||
# include <_G_config.h>
|
|
||||||
typedef _G_int32_t opus_int32;
|
|
||||||
typedef _G_uint32_t opus_uint32;
|
|
||||||
typedef _G_int16 opus_int16;
|
|
||||||
typedef _G_uint16 opus_uint16;
|
|
||||||
# elif defined(__MINGW32__)
|
|
||||||
typedef short opus_int16;
|
|
||||||
typedef unsigned short opus_uint16;
|
|
||||||
typedef int opus_int32;
|
|
||||||
typedef unsigned int opus_uint32;
|
|
||||||
# elif defined(__MWERKS__)
|
|
||||||
typedef int opus_int32;
|
|
||||||
typedef unsigned int opus_uint32;
|
|
||||||
typedef short opus_int16;
|
|
||||||
typedef unsigned short opus_uint16;
|
|
||||||
# else
|
|
||||||
/* MSVC/Borland */
|
|
||||||
typedef __int32 opus_int32;
|
|
||||||
typedef unsigned __int32 opus_uint32;
|
|
||||||
typedef __int16 opus_int16;
|
|
||||||
typedef unsigned __int16 opus_uint16;
|
|
||||||
# endif
|
|
||||||
|
|
||||||
#elif defined(__MACOS__)
|
|
||||||
|
|
||||||
# include <sys/types.h>
|
|
||||||
typedef SInt16 opus_int16;
|
|
||||||
typedef UInt16 opus_uint16;
|
|
||||||
typedef SInt32 opus_int32;
|
|
||||||
typedef UInt32 opus_uint32;
|
|
||||||
|
|
||||||
#elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */
|
|
||||||
|
|
||||||
# include <sys/types.h>
|
|
||||||
typedef int16_t opus_int16;
|
|
||||||
typedef u_int16_t opus_uint16;
|
|
||||||
typedef int32_t opus_int32;
|
|
||||||
typedef u_int32_t opus_uint32;
|
|
||||||
|
|
||||||
#elif defined(__BEOS__)
|
|
||||||
|
|
||||||
/* Be */
|
|
||||||
# include <inttypes.h>
|
|
||||||
typedef int16 opus_int16;
|
|
||||||
typedef u_int16 opus_uint16;
|
|
||||||
typedef int32_t opus_int32;
|
|
||||||
typedef u_int32_t opus_uint32;
|
|
||||||
|
|
||||||
#elif defined (__EMX__)
|
|
||||||
|
|
||||||
/* OS/2 GCC */
|
|
||||||
typedef short opus_int16;
|
|
||||||
typedef unsigned short opus_uint16;
|
|
||||||
typedef int opus_int32;
|
|
||||||
typedef unsigned int opus_uint32;
|
|
||||||
|
|
||||||
#elif defined (DJGPP)
|
|
||||||
|
|
||||||
/* DJGPP */
|
|
||||||
typedef short opus_int16;
|
|
||||||
typedef unsigned short opus_uint16;
|
|
||||||
typedef int opus_int32;
|
|
||||||
typedef unsigned int opus_uint32;
|
|
||||||
|
|
||||||
#elif defined(R5900)
|
|
||||||
|
|
||||||
/* PS2 EE */
|
|
||||||
typedef int opus_int32;
|
|
||||||
typedef unsigned opus_uint32;
|
|
||||||
typedef short opus_int16;
|
|
||||||
typedef unsigned short opus_uint16;
|
|
||||||
|
|
||||||
#elif defined(__SYMBIAN32__)
|
|
||||||
|
|
||||||
/* Symbian GCC */
|
|
||||||
typedef signed short opus_int16;
|
|
||||||
typedef unsigned short opus_uint16;
|
|
||||||
typedef signed int opus_int32;
|
|
||||||
typedef unsigned int opus_uint32;
|
|
||||||
|
|
||||||
#elif defined(CONFIG_TI_C54X) || defined (CONFIG_TI_C55X)
|
|
||||||
|
|
||||||
typedef short opus_int16;
|
|
||||||
typedef unsigned short opus_uint16;
|
|
||||||
typedef long opus_int32;
|
|
||||||
typedef unsigned long opus_uint32;
|
|
||||||
|
|
||||||
#elif defined(CONFIG_TI_C6X)
|
|
||||||
|
|
||||||
typedef short opus_int16;
|
|
||||||
typedef unsigned short opus_uint16;
|
|
||||||
typedef int opus_int32;
|
|
||||||
typedef unsigned int opus_uint32;
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
/* Give up, take a reasonable guess */
|
|
||||||
typedef short opus_int16;
|
|
||||||
typedef unsigned short opus_uint16;
|
|
||||||
typedef int opus_int32;
|
|
||||||
typedef unsigned int opus_uint32;
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* OPUS_TYPES_H */
|
|
|
@ -1,358 +0,0 @@
|
||||||
/* Copyright (c) 2017 Jean-Marc Valin */
|
|
||||||
/*
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
|
||||||
modification, are permitted provided that the following conditions
|
|
||||||
are met:
|
|
||||||
|
|
||||||
- Redistributions of source code must retain the above copyright
|
|
||||||
notice, this list of conditions and the following disclaimer.
|
|
||||||
|
|
||||||
- Redistributions in binary form must reproduce the above copyright
|
|
||||||
notice, this list of conditions and the following disclaimer in the
|
|
||||||
documentation and/or other materials provided with the distribution.
|
|
||||||
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
||||||
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
||||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
||||||
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
|
|
||||||
OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
|
||||||
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
|
||||||
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
|
||||||
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
|
||||||
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#if !defined(_opusenc_h)
|
|
||||||
# define _opusenc_h (1)
|
|
||||||
|
|
||||||
/**\mainpage
|
|
||||||
\section Introduction
|
|
||||||
|
|
||||||
This is the documentation for the <tt>libopusenc</tt> C API.
|
|
||||||
|
|
||||||
The <tt>libopusenc</tt> package provides a convenient high-level API for
|
|
||||||
encoding Ogg Opus files.
|
|
||||||
|
|
||||||
\section Organization
|
|
||||||
|
|
||||||
The main API is divided into several sections:
|
|
||||||
- \ref encoding
|
|
||||||
- \ref comments
|
|
||||||
- \ref encoder_ctl
|
|
||||||
- \ref callbacks
|
|
||||||
- \ref error_codes
|
|
||||||
|
|
||||||
\section Overview
|
|
||||||
|
|
||||||
The <tt>libopusfile</tt> API provides an easy way to encode Ogg Opus files using
|
|
||||||
<tt>libopus</tt>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
# if defined(__cplusplus)
|
|
||||||
extern "C" {
|
|
||||||
# endif
|
|
||||||
|
|
||||||
#include <opus.h>
|
|
||||||
|
|
||||||
#ifndef OPE_EXPORT
|
|
||||||
# if defined(WIN32)
|
|
||||||
# if defined(OPE_BUILD) && defined(DLL_EXPORT)
|
|
||||||
# define OPE_EXPORT __declspec(dllexport)
|
|
||||||
# else
|
|
||||||
# define OPE_EXPORT
|
|
||||||
# endif
|
|
||||||
# elif defined(__GNUC__) && defined(OPE_BUILD)
|
|
||||||
# define OPE_EXPORT __attribute__ ((visibility ("default")))
|
|
||||||
# else
|
|
||||||
# define OPE_EXPORT
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**\defgroup error_codes Error Codes*/
|
|
||||||
/*@{*/
|
|
||||||
/**\name List of possible error codes
|
|
||||||
Many of the functions in this library return a negative error code when a
|
|
||||||
function fails.
|
|
||||||
This list provides a brief explanation of the common errors.
|
|
||||||
See each individual function for more details on what a specific error code
|
|
||||||
means in that context.*/
|
|
||||||
/*@{*/
|
|
||||||
|
|
||||||
|
|
||||||
/* Bump this when we change the API. */
|
|
||||||
/** API version for this header. Can be used to check for features at compile time. */
|
|
||||||
#define OPE_API_VERSION 0
|
|
||||||
|
|
||||||
#define OPE_OK 0
|
|
||||||
/* Based on the relevant libopus code minus 10. */
|
|
||||||
#define OPE_BAD_ARG -11
|
|
||||||
#define OPE_INTERNAL_ERROR -13
|
|
||||||
#define OPE_UNIMPLEMENTED -15
|
|
||||||
#define OPE_ALLOC_FAIL -17
|
|
||||||
|
|
||||||
/* Specific to libopusenc. */
|
|
||||||
#define OPE_CANNOT_OPEN -30
|
|
||||||
#define OPE_TOO_LATE -31
|
|
||||||
#define OPE_UNRECOVERABLE -32
|
|
||||||
#define OPE_INVALID_PICTURE -33
|
|
||||||
#define OPE_INVALID_ICON -34
|
|
||||||
/*@}*/
|
|
||||||
/*@}*/
|
|
||||||
|
|
||||||
|
|
||||||
/* These are the "raw" request values -- they should usually not be used. */
|
|
||||||
#define OPE_SET_DECISION_DELAY_REQUEST 14000
|
|
||||||
#define OPE_GET_DECISION_DELAY_REQUEST 14001
|
|
||||||
#define OPE_SET_MUXING_DELAY_REQUEST 14002
|
|
||||||
#define OPE_GET_MUXING_DELAY_REQUEST 14003
|
|
||||||
#define OPE_SET_COMMENT_PADDING_REQUEST 14004
|
|
||||||
#define OPE_GET_COMMENT_PADDING_REQUEST 14005
|
|
||||||
#define OPE_SET_SERIALNO_REQUEST 14006
|
|
||||||
#define OPE_GET_SERIALNO_REQUEST 14007
|
|
||||||
#define OPE_SET_PACKET_CALLBACK_REQUEST 14008
|
|
||||||
/*#define OPE_GET_PACKET_CALLBACK_REQUEST 14009*/
|
|
||||||
#define OPE_SET_HEADER_GAIN_REQUEST 14010
|
|
||||||
#define OPE_GET_HEADER_GAIN_REQUEST 14011
|
|
||||||
|
|
||||||
/**\defgroup encoder_ctl Encoding Options*/
|
|
||||||
/*@{*/
|
|
||||||
|
|
||||||
/**\name Control parameters
|
|
||||||
|
|
||||||
Macros for setting encoder options.*/
|
|
||||||
/*@{*/
|
|
||||||
|
|
||||||
#define OPE_SET_DECISION_DELAY(x) OPE_SET_DECISION_DELAY_REQUEST, __opus_check_int(x)
|
|
||||||
#define OPE_GET_DECISION_DELAY(x) OPE_GET_DECISION_DELAY_REQUEST, __opus_check_int_ptr(x)
|
|
||||||
#define OPE_SET_MUXING_DELAY(x) OPE_SET_MUXING_DELAY_REQUEST, __opus_check_int(x)
|
|
||||||
#define OPE_GET_MUXING_DELAY(x) OPE_GET_MUXING_DELAY_REQUEST, __opus_check_int_ptr(x)
|
|
||||||
#define OPE_SET_COMMENT_PADDING(x) OPE_SET_COMMENT_PADDING_REQUEST, __opus_check_int(x)
|
|
||||||
#define OPE_GET_COMMENT_PADDING(x) OPE_GET_COMMENT_PADDING_REQUEST, __opus_check_int_ptr(x)
|
|
||||||
#define OPE_SET_SERIALNO(x) OPE_SET_SERIALNO_REQUEST, __opus_check_int(x)
|
|
||||||
#define OPE_GET_SERIALNO(x) OPE_GET_SERIALNO_REQUEST, __opus_check_int_ptr(x)
|
|
||||||
/* FIXME: Add type-checking macros to these. */
|
|
||||||
#define OPE_SET_PACKET_CALLBACK(x,u) OPE_SET_PACKET_CALLBACK_REQUEST, (x), (u)
|
|
||||||
/*#define OPE_GET_PACKET_CALLBACK(x,u) OPE_GET_PACKET_CALLBACK_REQUEST, (x), (u)*/
|
|
||||||
#define OPE_SET_HEADER_GAIN(x,u) OPE_SET_HEADER_GAIN_REQUEST, __opus_check_int(x)
|
|
||||||
#define OPE_GET_HEADER_GAIN(x,u) OPE_GET_HEADER_GAIN_REQUEST, __opus_check_int_ptr(x)
|
|
||||||
/*@}*/
|
|
||||||
/*@}*/
|
|
||||||
|
|
||||||
/**\defgroup callbacks Callback Functions */
|
|
||||||
/*@{*/
|
|
||||||
|
|
||||||
/**\name Callback functions
|
|
||||||
|
|
||||||
These are the callbacks that can be implemented for an encoder.*/
|
|
||||||
/*@{*/
|
|
||||||
|
|
||||||
/** Called for writing a page. */
|
|
||||||
typedef int (*ope_write_func)(void *user_data, const unsigned char *ptr, opus_int32 len);
|
|
||||||
|
|
||||||
/** Called for closing a stream. */
|
|
||||||
typedef int (*ope_close_func)(void *user_data);
|
|
||||||
|
|
||||||
/** Called on every packet encoded (including header). */
|
|
||||||
typedef int (*ope_packet_func)(void *user_data, const unsigned char *packet_ptr, opus_int32 packet_len, opus_uint32 flags);
|
|
||||||
|
|
||||||
/** Callback functions for accessing the stream. */
|
|
||||||
typedef struct {
|
|
||||||
/** Callback for writing to the stream. */
|
|
||||||
ope_write_func write;
|
|
||||||
/** Callback for closing the stream. */
|
|
||||||
ope_close_func close;
|
|
||||||
} OpusEncCallbacks;
|
|
||||||
/*@}*/
|
|
||||||
/*@}*/
|
|
||||||
|
|
||||||
/** Opaque comments struct. */
|
|
||||||
typedef struct OggOpusComments OggOpusComments;
|
|
||||||
|
|
||||||
/** Opaque encoder struct. */
|
|
||||||
typedef struct OggOpusEnc OggOpusEnc;
|
|
||||||
|
|
||||||
/**\defgroup comments Comments Handling */
|
|
||||||
/*@{*/
|
|
||||||
|
|
||||||
/**\name Functions for handling comments
|
|
||||||
|
|
||||||
These functions make it possible to add comments and pictures to Ogg Opus files.*/
|
|
||||||
/*@{*/
|
|
||||||
|
|
||||||
/** Create a new comments object.
|
|
||||||
\return Newly-created comments object. */
|
|
||||||
OPE_EXPORT OggOpusComments *ope_comments_create(void);
|
|
||||||
|
|
||||||
/** Create a deep copy of a comments object.
|
|
||||||
\param comments Comments object to copy
|
|
||||||
\return Deep copy of input. */
|
|
||||||
OPE_EXPORT OggOpusComments *ope_comments_copy(OggOpusComments *comments);
|
|
||||||
|
|
||||||
/** Destroys a comments object.
|
|
||||||
\param comments Comments object to destroy*/
|
|
||||||
OPE_EXPORT void ope_comments_destroy(OggOpusComments *comments);
|
|
||||||
|
|
||||||
/** Add a comment.
|
|
||||||
\param[in,out] comments Where to add the comments
|
|
||||||
\param tag Tag for the comment (must not contain = char)
|
|
||||||
\param val Value for the tag
|
|
||||||
\return Error code
|
|
||||||
*/
|
|
||||||
OPE_EXPORT int ope_comments_add(OggOpusComments *comments, const char *tag, const char *val);
|
|
||||||
|
|
||||||
/** Add a comment as a single tag=value string.
|
|
||||||
\param[in,out] comments Where to add the comments
|
|
||||||
\param tag_and_val string of the form tag=value (must contain = char)
|
|
||||||
\return Error code
|
|
||||||
*/
|
|
||||||
OPE_EXPORT int ope_comments_add_string(OggOpusComments *comments, const char *tag_and_val);
|
|
||||||
|
|
||||||
/** Add a picture.
|
|
||||||
\param[in,out] comments Where to add the comments
|
|
||||||
\param filename File name for the picture
|
|
||||||
\param picture_type Type of picture (-1 for default)
|
|
||||||
\param description Description (NULL means no comment)
|
|
||||||
\return Error code
|
|
||||||
*/
|
|
||||||
OPE_EXPORT int ope_comments_add_picture(OggOpusComments *comments, const char *filename, int picture_type, const char *description);
|
|
||||||
|
|
||||||
/*@}*/
|
|
||||||
/*@}*/
|
|
||||||
|
|
||||||
/**\defgroup encoding Encoding */
|
|
||||||
/*@{*/
|
|
||||||
|
|
||||||
/**\name Functions for encoding Ogg Opus files
|
|
||||||
|
|
||||||
These functions make it possible to encode Ogg Opus files.*/
|
|
||||||
/*@{*/
|
|
||||||
|
|
||||||
/** Create a new OggOpus file.
|
|
||||||
\param path Path where to create the file
|
|
||||||
\param comments Comments associated with the stream
|
|
||||||
\param rate Input sampling rate (48 kHz is faster)
|
|
||||||
\param channels Number of channels
|
|
||||||
\param family Mapping family (0 for mono/stereo, 1 for surround)
|
|
||||||
\param[out] error Error code (NULL if no error is to be returned)
|
|
||||||
\return Newly-created encoder.
|
|
||||||
*/
|
|
||||||
OPE_EXPORT OggOpusEnc *ope_encoder_create_file(const char *path, OggOpusComments *comments, opus_int32 rate, int channels, int family, int *error);
|
|
||||||
|
|
||||||
/** Create a new OggOpus stream to be handled using callbacks
|
|
||||||
\param callbacks Callback functions
|
|
||||||
\param user_data Pointer to be associated with the stream and passed to the callbacks
|
|
||||||
\param comments Comments associated with the stream
|
|
||||||
\param rate Input sampling rate (48 kHz is faster)
|
|
||||||
\param channels Number of channels
|
|
||||||
\param family Mapping family (0 for mono/stereo, 1 for surround)
|
|
||||||
\param[out] error Error code (NULL if no error is to be returned)
|
|
||||||
\return Newly-created encoder.
|
|
||||||
*/
|
|
||||||
OPE_EXPORT OggOpusEnc *ope_encoder_create_callbacks(const OpusEncCallbacks *callbacks, void *user_data,
|
|
||||||
OggOpusComments *comments, opus_int32 rate, int channels, int family, int *error);
|
|
||||||
|
|
||||||
/** Create a new OggOpus stream to be used along with.ope_encoder_get_page().
|
|
||||||
This is mostly useful for muxing with other streams.
|
|
||||||
\param comments Comments associated with the stream
|
|
||||||
\param rate Input sampling rate (48 kHz is faster)
|
|
||||||
\param channels Number of channels
|
|
||||||
\param family Mapping family (0 for mono/stereo, 1 for surround)
|
|
||||||
\param[out] error Error code (NULL if no error is to be returned)
|
|
||||||
\return Newly-created encoder.
|
|
||||||
*/
|
|
||||||
OPE_EXPORT OggOpusEnc *ope_encoder_create_pull(OggOpusComments *comments, opus_int32 rate, int channels, int family, int *error);
|
|
||||||
|
|
||||||
/** Add/encode any number of float samples to the stream.
|
|
||||||
\param[in,out] enc Encoder
|
|
||||||
\param pcm Floating-point PCM values in the +/-1 range (interleaved if multiple channels)
|
|
||||||
\param samples_per_channel Number of samples for each channel
|
|
||||||
\return Error code*/
|
|
||||||
OPE_EXPORT int ope_encoder_write_float(OggOpusEnc *enc, const float *pcm, int samples_per_channel);
|
|
||||||
|
|
||||||
/** Add/encode any number of 16-bit linear samples to the stream.
|
|
||||||
\param[in,out] enc Encoder
|
|
||||||
\param pcm Linear 16-bit PCM values in the [-32768,32767] range (interleaved if multiple channels)
|
|
||||||
\param samples_per_channel Number of samples for each channel
|
|
||||||
\return Error code*/
|
|
||||||
OPE_EXPORT int ope_encoder_write(OggOpusEnc *enc, const opus_int16 *pcm, int samples_per_channel);
|
|
||||||
|
|
||||||
/** Get the next page from the stream (only if using ope_encoder_create_pull()).
|
|
||||||
\param[in,out] enc Encoder
|
|
||||||
\param[out] page Next available encoded page
|
|
||||||
\param[out] len Size (in bytes) of the page returned
|
|
||||||
\param flush If non-zero, forces a flush of the page (if any data avaiable)
|
|
||||||
\return 1 if there is a page available, 0 if not. */
|
|
||||||
OPE_EXPORT int ope_encoder_get_page(OggOpusEnc *enc, unsigned char **page, opus_int32 *len, int flush);
|
|
||||||
|
|
||||||
/** Finalizes the stream, but does not deallocate the object.
|
|
||||||
\param[in,out] enc Encoder
|
|
||||||
\return Error code
|
|
||||||
*/
|
|
||||||
OPE_EXPORT int ope_encoder_drain(OggOpusEnc *enc);
|
|
||||||
|
|
||||||
/** Deallocates the obect. Make sure to ope_drain() first.
|
|
||||||
\param[in,out] enc Encoder
|
|
||||||
*/
|
|
||||||
OPE_EXPORT void ope_encoder_destroy(OggOpusEnc *enc);
|
|
||||||
|
|
||||||
/** Ends the stream and create a new stream within the same file.
|
|
||||||
\param[in,out] enc Encoder
|
|
||||||
\param comments Comments associated with the stream
|
|
||||||
\return Error code
|
|
||||||
*/
|
|
||||||
OPE_EXPORT int ope_encoder_chain_current(OggOpusEnc *enc, OggOpusComments *comments);
|
|
||||||
|
|
||||||
/** Ends the stream and create a new file.
|
|
||||||
\param[in,out] enc Encoder
|
|
||||||
\param path Path where to write the new file
|
|
||||||
\param comments Comments associated with the stream
|
|
||||||
\return Error code
|
|
||||||
*/
|
|
||||||
OPE_EXPORT int ope_encoder_continue_new_file(OggOpusEnc *enc, const char *path, OggOpusComments *comments);
|
|
||||||
|
|
||||||
/** Ends the stream and create a new file (callback-based).
|
|
||||||
\param[in,out] enc Encoder
|
|
||||||
\param user_data Pointer to be associated with the new stream and passed to the callbacks
|
|
||||||
\param comments Comments associated with the stream
|
|
||||||
\return Error code
|
|
||||||
*/
|
|
||||||
OPE_EXPORT int ope_encoder_continue_new_callbacks(OggOpusEnc *enc, void *user_data, OggOpusComments *comments);
|
|
||||||
|
|
||||||
/** Write out the header now rather than wait for audio to begin.
|
|
||||||
\param[in,out] enc Encoder
|
|
||||||
\return Error code
|
|
||||||
*/
|
|
||||||
OPE_EXPORT int ope_encoder_flush_header(OggOpusEnc *enc);
|
|
||||||
|
|
||||||
/** Sets encoder options.
|
|
||||||
\param[in,out] enc Encoder
|
|
||||||
\param request Use a request macro
|
|
||||||
\return Error code
|
|
||||||
*/
|
|
||||||
OPE_EXPORT int ope_encoder_ctl(OggOpusEnc *enc, int request, ...);
|
|
||||||
|
|
||||||
/** Converts a libopusenc error code into a human readable string.
|
|
||||||
*
|
|
||||||
* @param error Error number
|
|
||||||
* @returns Error string
|
|
||||||
*/
|
|
||||||
OPE_EXPORT const char *ope_strerror(int error);
|
|
||||||
|
|
||||||
/** Returns a string representing the version of libopusenc being used at run time.
|
|
||||||
\return A string describing the version of this library */
|
|
||||||
OPE_EXPORT const char *ope_get_version_string(void);
|
|
||||||
|
|
||||||
/** ABI version for this header. Can be used to check for features at run time.
|
|
||||||
\return An integer representing the ABI version */
|
|
||||||
OPE_EXPORT int ope_get_abi_version(void);
|
|
||||||
|
|
||||||
/*@}*/
|
|
||||||
/*@}*/
|
|
||||||
|
|
||||||
# if defined(__cplusplus)
|
|
||||||
}
|
|
||||||
# endif
|
|
||||||
|
|
||||||
#endif
|
|
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue