zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved legacy_encoded_audio_frame into audio_decoder_interface.

Browse Source 
audio_decoder.cc depends on LegacyEncodedAudioFrame and
LegacyEncodedAudioFrame depends on AudioDecoder::EncodedAudioFrame, so
there's no clear way to separate them as of now. This error is also
hodling up builds downstream. I expect we'll revisit these
dependencies as part of the upcoming larger restructuring effort.

NOTRY=true
BUG=webrtc:5805

Review-Url: https://codereview.webrtc.org/2359763002
Cr-Commit-Position: refs/heads/master@{#14329}
This commit is contained in:
ossu
2016-09-21 05:50:37 -07:00
committed by Commit bot
parent 17802ae258
commit 7f40ba4414
7 changed files with 5 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
webrtc/modules/audio_coding/BUILD.gn
View File

@ -128,9 +128,10 @@ rtc_source_set("audio_decoder_interface") {
sources = [
"codecs/audio_decoder.cc",
"codecs/audio_decoder.h",
"codecs/legacy_encoded_audio_frame.cc",
"codecs/legacy_encoded_audio_frame.h",
]
deps = [
":legacy_encoded_audio_frame",
"../..:webrtc_common",
"../../base:rtc_base_approved",
]
@ -188,13 +189,6 @@ rtc_source_set("red") {
]
}
rtc_source_set("legacy_encoded_audio_frame") {
sources = [
"codecs/legacy_encoded_audio_frame.cc",
"codecs/legacy_encoded_audio_frame.h",
]
}
config("g711_config") {
include_dirs = [
"../../..",
@ -219,7 +213,6 @@ rtc_source_set("g711") {
deps = [
":audio_decoder_interface",
":audio_encoder_interface",
":legacy_encoded_audio_frame",
]
}
@ -248,7 +241,6 @@ rtc_source_set("g722") {
deps = [
":audio_decoder_interface",
":audio_encoder_interface",
":legacy_encoded_audio_frame",
]
}