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

Side by Side Diff: media/webm/webm_parser.cc

Issue 15342004: Adding VP8 Alpha support in Media Source (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressing comments Created 7 years, 7 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/webm/webm_constants.h ('k') | media/webm/webm_video_client.h » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "media/webm/webm_parser.h" 5 #include "media/webm/webm_parser.h"
6 6
7 // This file contains code to parse WebM file elements. It was created 7 // This file contains code to parse WebM file elements. It was created
8 // from information in the Matroska spec. 8 // from information in the Matroska spec.
9 // http://www.matroska.org/technical/specs/index.html 9 // http://www.matroska.org/technical/specs/index.html
10 // This file contains code for encrypted WebM. Current WebM 10 // This file contains code for encrypted WebM. Current WebM
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 172
173 static const ElementIdInfo kTrackTranslateIds[] = { 173 static const ElementIdInfo kTrackTranslateIds[] = {
174 {UINT, kWebMIdTrackTranslateEditionUID}, 174 {UINT, kWebMIdTrackTranslateEditionUID},
175 {UINT, kWebMIdTrackTranslateCodec}, 175 {UINT, kWebMIdTrackTranslateCodec},
176 {BINARY, kWebMIdTrackTranslateTrackID}, 176 {BINARY, kWebMIdTrackTranslateTrackID},
177 }; 177 };
178 178
179 static const ElementIdInfo kVideoIds[] = { 179 static const ElementIdInfo kVideoIds[] = {
180 {UINT, kWebMIdFlagInterlaced}, 180 {UINT, kWebMIdFlagInterlaced},
181 {UINT, kWebMIdStereoMode}, 181 {UINT, kWebMIdStereoMode},
182 {UINT, kWebMIdAlphaMode},
182 {UINT, kWebMIdPixelWidth}, 183 {UINT, kWebMIdPixelWidth},
183 {UINT, kWebMIdPixelHeight}, 184 {UINT, kWebMIdPixelHeight},
184 {UINT, kWebMIdPixelCropBottom}, 185 {UINT, kWebMIdPixelCropBottom},
185 {UINT, kWebMIdPixelCropTop}, 186 {UINT, kWebMIdPixelCropTop},
186 {UINT, kWebMIdPixelCropLeft}, 187 {UINT, kWebMIdPixelCropLeft},
187 {UINT, kWebMIdPixelCropRight}, 188 {UINT, kWebMIdPixelCropRight},
188 {UINT, kWebMIdDisplayWidth}, 189 {UINT, kWebMIdDisplayWidth},
189 {UINT, kWebMIdDisplayHeight}, 190 {UINT, kWebMIdDisplayHeight},
190 {UINT, kWebMIdDisplayUnit}, 191 {UINT, kWebMIdDisplayUnit},
191 {UINT, kWebMIdAspectRatioType}, 192 {UINT, kWebMIdAspectRatioType},
(...skipping 741 matching lines...) Expand 10 before | Expand all | Expand 10 after
933 if (kSegmentIds[i].id_ == id_b) 934 if (kSegmentIds[i].id_ == id_b)
934 return true; 935 return true;
935 } 936 }
936 } 937 }
937 938
938 // kWebMIdSegment siblings. 939 // kWebMIdSegment siblings.
939 return ((id_b == kWebMIdSegment) || (id_b == kWebMIdEBMLHeader)); 940 return ((id_b == kWebMIdSegment) || (id_b == kWebMIdEBMLHeader));
940 } 941 }
941 942
942 } // namespace media 943 } // namespace media
OLDNEW
« no previous file with comments | « media/webm/webm_constants.h ('k') | media/webm/webm_video_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698