media/formats/mp4/fourccs.h - Issue 812643005: Re-add AC3/EAC3 audio demuxing support

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: media/formats/mp4/fourccs.h

Issue 812643005: Re-add AC3/EAC3 audio demuxing support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 11 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 unified diff | Download patch

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef MEDIA_FORMATS_MP4_FOURCCS_H_	5 #ifndef MEDIA_FORMATS_MP4_FOURCCS_H_

6 #define MEDIA_FORMATS_MP4_FOURCCS_H_	6 #define MEDIA_FORMATS_MP4_FOURCCS_H_

7	7

8 #include <string>	8 #include <string>

9	9

10 namespace media {	10 namespace media {

11 namespace mp4 {	11 namespace mp4 {

12	12

13 enum FourCC {	13 enum FourCC {

14 FOURCC_NULL = 0,	14 FOURCC_NULL = 0,

	15 #if defined(ENABLE_AC3_EAC3_AUDIO_DEMUXING)

	16 FOURCC_AC_3 = 0x61632d33, // "ac-3"
	ddorwin 2016/01/07 19:12:43 You can drop the second '_' now. It was only neces You can drop the second '_' now. It was only necessary when there were multiple variants for each. servolk 2016/01/07 21:17:36 Done. Show quoted text On 2016/01/07 19:12:43, ddorwin wrote: > You can drop the second '_' now. It was only necessary when there were multiple > variants for each. Done.
	17 FOURCC_EAC_3 = 0x65632d33, // "ec-3"

	18 #endif

15 FOURCC_AVC1 = 0x61766331,	19 FOURCC_AVC1 = 0x61766331,

16 FOURCC_AVC3 = 0x61766333,	20 FOURCC_AVC3 = 0x61766333,

17 FOURCC_AVCC = 0x61766343,	21 FOURCC_AVCC = 0x61766343,

18 FOURCC_BLOC = 0x626C6F63,	22 FOURCC_BLOC = 0x626C6F63,

19 FOURCC_CENC = 0x63656e63,	23 FOURCC_CENC = 0x63656e63,

20 FOURCC_CO64 = 0x636f3634,	24 FOURCC_CO64 = 0x636f3634,

21 FOURCC_CTTS = 0x63747473,	25 FOURCC_CTTS = 0x63747473,

22 FOURCC_DINF = 0x64696e66,	26 FOURCC_DINF = 0x64696e66,

23 FOURCC_EDTS = 0x65647473,	27 FOURCC_EDTS = 0x65647473,

24 FOURCC_EMSG = 0x656d7367,	28 FOURCC_EMSG = 0x656d7367,

(...skipping 75 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
100 buf[2] = (fourcc >> 8) & 0xff;	104 buf[2] = (fourcc >> 8) & 0xff;

101 buf[3] = (fourcc) & 0xff;	105 buf[3] = (fourcc) & 0xff;

102 buf[4] = 0;	106 buf[4] = 0;

103 return std::string(buf);	107 return std::string(buf);

104 }	108 }

105	109

106 } // namespace mp4	110 } // namespace mp4

107 } // namespace media	111 } // namespace media

108	112

109 #endif // MEDIA_FORMATS_MP4_FOURCCS_H_	113 #endif // MEDIA_FORMATS_MP4_FOURCCS_H_

OLD	NEW

« media/ffmpeg/ffmpeg_common.cc ('K') | « media/formats/mp4/es_descriptor.h ('k') | media/formats/mp4/mp4_stream_parser.cc » ('j') | media/formats/mp4/mp4_stream_parser.cc » ('J')