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

Side by Side Diff: media/base/container_names.h

Issue 2819863003: Only run container name detection upon ffmpeg parse failure. (Closed)
Patch Set: Created 3 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 | « no previous file | media/base/container_names.cc » ('j') | media/filters/ffmpeg_glue.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_BASE_CONTAINER_NAMES_H_ 5 #ifndef MEDIA_BASE_CONTAINER_NAMES_H_
6 #define MEDIA_BASE_CONTAINER_NAMES_H_ 6 #define MEDIA_BASE_CONTAINER_NAMES_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "media/base/media_export.h" 10 #include "media/base/media_export.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 CONTAINER_SWF, // SWF (ShockWave Flash) 55 CONTAINER_SWF, // SWF (ShockWave Flash)
56 CONTAINER_VC1, // VC-1 56 CONTAINER_VC1, // VC-1
57 CONTAINER_WAV, // WAV / WAVE (Waveform Audio) 57 CONTAINER_WAV, // WAV / WAVE (Waveform Audio)
58 CONTAINER_WEBM, // Matroska / WebM 58 CONTAINER_WEBM, // Matroska / WebM
59 CONTAINER_WTV, // WTV (Windows Television) 59 CONTAINER_WTV, // WTV (Windows Television)
60 CONTAINER_DASH, // DASH (MPEG-DASH) 60 CONTAINER_DASH, // DASH (MPEG-DASH)
61 CONTAINER_SMOOTHSTREAM, // SmoothStreaming 61 CONTAINER_SMOOTHSTREAM, // SmoothStreaming
62 CONTAINER_MAX // Must be last 62 CONTAINER_MAX // Must be last
63 }; 63 };
64 64
65 // Minimum size considered for processing.
66 enum { kMinimumContainerSize = 12 };
67
65 // Determine the container type. 68 // Determine the container type.
66 MEDIA_EXPORT MediaContainerName DetermineContainer(const uint8_t* buffer, 69 MEDIA_EXPORT MediaContainerName DetermineContainer(const uint8_t* buffer,
67 int buffer_size); 70 int buffer_size);
68 71
69 } // namespace container_names 72 } // namespace container_names
70 73
71 } // namespace media 74 } // namespace media
72 75
73 #endif // MEDIA_BASE_CONTAINER_NAMES_H_ 76 #endif // MEDIA_BASE_CONTAINER_NAMES_H_
OLDNEW
« no previous file with comments | « no previous file | media/base/container_names.cc » ('j') | media/filters/ffmpeg_glue.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698