Add AAC codec specific data for MSE on android

Add AAC codec specific data for MSE on android

For AAC/ADTS, MediaCodec needs csd in order to work properly.
Passing the csd data from the stream parser using the extra_data field.

BUG=233420
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=203330

[qinmin, 2013-05-29 19:04:20]

PTAL

[acolwell GONE FROM CHROMIUM, 2013-05-29 22:37:25]

LGTM % comments

https://codereview.chromium.org/16114009/diff/1/media/mp4/aac.cc
File media/mp4/aac.cc (right):

https://codereview.chromium.org/16114009/diff/1/media/mp4/aac.cc#newcode194
media/mp4/aac.cc:194: std::vector<uint8> csd;
I don't believe this is sufficient for all cases. I think you really should just
store a copy of the vector passed to Parse() and return that.

https://codereview.chromium.org/16114009/diff/1/media/mp4/mp4_stream_parser.cc
File media/mp4/mp4_stream_parser.cc (right):

https://codereview.chromium.org/16114009/diff/1/media/mp4/mp4_stream_parser.c...
media/mp4/mp4_stream_parser.cc:257: std::vector<uint8> csd =
aac.GetCodecSpecificData();
How about something like this instead?

std::vector<uint8> extra_data;
#if defined(OS_ANDROID)
if (ESDescriptor::IsAAC(audio_type))
  extra_data = aac.GetCodecSpecificData();
#endif
audio_config.Initialize(
  codec, sample_format, channel_layout, sample_per_second,
  extra_data.size() ? &extra_data[0] : NULL, extra_data.size(),
  is_audio_track_encrypted_, false);

[qinmin, 2013-05-30 03:07:55]

https://codereview.chromium.org/16114009/diff/1/media/mp4/aac.cc
File media/mp4/aac.cc (right):

https://codereview.chromium.org/16114009/diff/1/media/mp4/aac.cc#newcode194
media/mp4/aac.cc:194: std::vector<uint8> csd;
On 2013/05/29 22:37:25, acolwell wrote:
> I don't believe this is sufficient for all cases. I think you really should
just
> store a copy of the vector passed to Parse() and return that.

Done.

https://codereview.chromium.org/16114009/diff/1/media/mp4/mp4_stream_parser.cc
File media/mp4/mp4_stream_parser.cc (right):

https://codereview.chromium.org/16114009/diff/1/media/mp4/mp4_stream_parser.c...
media/mp4/mp4_stream_parser.cc:257: std::vector<uint8> csd =
aac.GetCodecSpecificData();
On 2013/05/29 22:37:25, acolwell wrote:
> How about something like this instead?
> 
> std::vector<uint8> extra_data;
> #if defined(OS_ANDROID)
> if (ESDescriptor::IsAAC(audio_type))
>   extra_data = aac.GetCodecSpecificData();
> #endif
> audio_config.Initialize(
>   codec, sample_format, channel_layout, sample_per_second,
>   extra_data.size() ? &extra_data[0] : NULL, extra_data.size(),
>   is_audio_track_encrypted_, false);

Done.

[commit-bot: I haz the power, 2013-05-30 22:21:34]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/qinmin@chromium.org/16114009/12001

[commit-bot: I haz the power, 2013-05-31 03:48:42]

Change committed as 203330