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

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

Issue 1899423002: Revert of Implement support for vp9 in ISO-BMFF (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
« no previous file with comments | « media/formats/mp4/box_definitions.cc ('k') | media/formats/mp4/mp4_stream_parser.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #include "media/media_features.h" 10 #include "media/media_features.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 FOURCC_TFHD = 0x74666864, 93 FOURCC_TFHD = 0x74666864,
94 FOURCC_TKHD = 0x746b6864, 94 FOURCC_TKHD = 0x746b6864,
95 FOURCC_TRAF = 0x74726166, 95 FOURCC_TRAF = 0x74726166,
96 FOURCC_TRAK = 0x7472616b, 96 FOURCC_TRAK = 0x7472616b,
97 FOURCC_TREX = 0x74726578, 97 FOURCC_TREX = 0x74726578,
98 FOURCC_TRUN = 0x7472756e, 98 FOURCC_TRUN = 0x7472756e,
99 FOURCC_UDTA = 0x75647461, 99 FOURCC_UDTA = 0x75647461,
100 FOURCC_UUID = 0x75756964, 100 FOURCC_UUID = 0x75756964,
101 FOURCC_VIDE = 0x76696465, 101 FOURCC_VIDE = 0x76696465,
102 FOURCC_VMHD = 0x766d6864, 102 FOURCC_VMHD = 0x766d6864,
103 FOURCC_VP09 = 0x76703039,
104 FOURCC_WIDE = 0x77696465, 103 FOURCC_WIDE = 0x77696465,
105 }; 104 };
106 105
107 const inline std::string FourCCToString(FourCC fourcc) { 106 const inline std::string FourCCToString(FourCC fourcc) {
108 char buf[5]; 107 char buf[5];
109 buf[0] = (fourcc >> 24) & 0xff; 108 buf[0] = (fourcc >> 24) & 0xff;
110 buf[1] = (fourcc >> 16) & 0xff; 109 buf[1] = (fourcc >> 16) & 0xff;
111 buf[2] = (fourcc >> 8) & 0xff; 110 buf[2] = (fourcc >> 8) & 0xff;
112 buf[3] = (fourcc) & 0xff; 111 buf[3] = (fourcc) & 0xff;
113 buf[4] = 0; 112 buf[4] = 0;
114 113
115 // Return hex itself if characters can not be printed. Any character within 114 // Return hex itself if characters can not be printed. Any character within
116 // the "C" locale is considered printable. 115 // the "C" locale is considered printable.
117 for (int i = 0; i < 4; ++i) { 116 for (int i = 0; i < 4; ++i) {
118 if (!(buf[i] > 0x1f && buf[i] < 0x7f)) { 117 if (!(buf[i] > 0x1f && buf[i] < 0x7f)) {
119 std::stringstream hex_string; 118 std::stringstream hex_string;
120 hex_string << "0x" << std::hex << fourcc; 119 hex_string << "0x" << std::hex << fourcc;
121 return hex_string.str(); 120 return hex_string.str();
122 } 121 }
123 } 122 }
124 123
125 return std::string(buf); 124 return std::string(buf);
126 } 125 }
127 126
128 } // namespace mp4 127 } // namespace mp4
129 } // namespace media 128 } // namespace media
130 129
131 #endif // MEDIA_FORMATS_MP4_FOURCCS_H_ 130 #endif // MEDIA_FORMATS_MP4_FOURCCS_H_
OLDNEW
« no previous file with comments | « media/formats/mp4/box_definitions.cc ('k') | media/formats/mp4/mp4_stream_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698