Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(961)

Unified Diff: media/formats/mpeg/adts_header_parser.cc

Issue 2063443002: Return parsed sample frequency of ADTS header (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: SBR Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/formats/mpeg/adts_header_parser.cc
diff --git a/media/formats/mpeg/adts_header_parser.cc b/media/formats/mpeg/adts_header_parser.cc
index b2162a905028561899389aadbe834d2139c97928..e7456e6ac90a2da62a027ad109884ad1c622f6ce 100644
--- a/media/formats/mpeg/adts_header_parser.cc
+++ b/media/formats/mpeg/adts_header_parser.cc
@@ -29,8 +29,10 @@ size_t ExtractAdtsChannelConfig(const uint8_t* adts_header) {
bool ParseAdtsHeader(const uint8_t* adts_header,
bool is_sbr,
- AudioDecoderConfig* config) {
+ AudioDecoderConfig* config,
+ size_t* orig_sample_freq) {
DCHECK(adts_header);
+ DCHECK(orig_sample_freq);
size_t frequency_index = ExtractAdtsFrequencyIndex(adts_header);
if (frequency_index >= kADTSFrequencyTableSize) {
@@ -58,6 +60,7 @@ bool ParseAdtsHeader(const uint8_t* adts_header,
// TODO(damienv) : Extend sample rate cap to 96kHz for Level 5 content.
int extended_samples_per_second =
is_sbr ? std::min(2 * samples_per_second, 48000) : samples_per_second;
+ *orig_sample_freq = samples_per_second;
// The following code is written according to ISO 14496 Part 3 Table 1.13 -
// Syntax of AudioSpecificConfig.
« media/formats/mp2t/es_parser_adts_unittest.cc ('K') | « media/formats/mpeg/adts_header_parser.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698