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

Side by Side Diff: media/base/container_names_unittest.cc

Issue 2807463003: Simplify checking for MP3 format (Closed)
Patch Set: Simplify 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
« media/base/container_names.cc ('K') | « media/base/container_names.cc ('k') | no next file » | 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) 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 #include <stdint.h> 5 #include <stdint.h>
6 6
7 #include "base/files/file_util.h" 7 #include "base/files/file_util.h"
8 #include "media/base/container_names.h" 8 #include "media/base/container_names.h"
9 #include "media/base/test_data_util.h" 9 #include "media/base/test_data_util.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 TestFile(CONTAINER_MOV, GetTestDataFilePath("sfx.m4a")); 164 TestFile(CONTAINER_MOV, GetTestDataFilePath("sfx.m4a"));
165 } 165 }
166 166
167 TEST(ContainerNamesTest, FileCheckWEBM) { 167 TEST(ContainerNamesTest, FileCheckWEBM) {
168 TestFile(CONTAINER_WEBM, GetTestDataFilePath("bear-320x240.webm")); 168 TestFile(CONTAINER_WEBM, GetTestDataFilePath("bear-320x240.webm"));
169 TestFile(CONTAINER_WEBM, GetTestDataFilePath("no_streams.webm")); 169 TestFile(CONTAINER_WEBM, GetTestDataFilePath("no_streams.webm"));
170 TestFile(CONTAINER_WEBM, GetTestDataFilePath("webm_ebml_element")); 170 TestFile(CONTAINER_WEBM, GetTestDataFilePath("webm_ebml_element"));
171 } 171 }
172 172
173 TEST(ContainerNamesTest, FileCheckMP3) { 173 TEST(ContainerNamesTest, FileCheckMP3) {
174 TestFile(CONTAINER_MP3, GetTestDataFilePath("bear-audio-10s-CBR-no-TOC.mp3"));
DaleCurtis 2017/04/11 23:35:45 These tests failed before this patch right?
jrummell 2017/04/12 00:18:26 Correct.
175 TestFile(CONTAINER_MP3, GetTestDataFilePath("id3_png_test.mp3"));
174 TestFile(CONTAINER_MP3, GetTestDataFilePath("id3_test.mp3")); 176 TestFile(CONTAINER_MP3, GetTestDataFilePath("id3_test.mp3"));
177 TestFile(CONTAINER_MP3, GetTestDataFilePath("midstream_config_change.mp3"));
175 TestFile(CONTAINER_MP3, GetTestDataFilePath("sfx.mp3")); 178 TestFile(CONTAINER_MP3, GetTestDataFilePath("sfx.mp3"));
176 } 179 }
177 180
178 TEST(ContainerNamesTest, FileCheckAC3) { 181 TEST(ContainerNamesTest, FileCheckAC3) {
179 TestFile(CONTAINER_AC3, GetTestDataFilePath("bear.ac3")); 182 TestFile(CONTAINER_AC3, GetTestDataFilePath("bear.ac3"));
180 } 183 }
181 184
182 TEST(ContainerNamesTest, FileCheckAAC) { 185 TEST(ContainerNamesTest, FileCheckAAC) {
183 TestFile(CONTAINER_AAC, GetTestDataFilePath("bear.adts")); 186 TestFile(CONTAINER_AAC, GetTestDataFilePath("bear.adts"));
184 } 187 }
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 TestFile(CONTAINER_UNKNOWN, GetTestDataFilePath("ten_byte_file")); 243 TestFile(CONTAINER_UNKNOWN, GetTestDataFilePath("ten_byte_file"));
241 TestFile(CONTAINER_UNKNOWN, GetTestDataFilePath("README")); 244 TestFile(CONTAINER_UNKNOWN, GetTestDataFilePath("README"));
242 TestFile(CONTAINER_UNKNOWN, GetTestDataFilePath("bali_640x360_P422.yuv")); 245 TestFile(CONTAINER_UNKNOWN, GetTestDataFilePath("bali_640x360_P422.yuv"));
243 TestFile(CONTAINER_UNKNOWN, GetTestDataFilePath("bali_640x360_RGB24.rgb")); 246 TestFile(CONTAINER_UNKNOWN, GetTestDataFilePath("bali_640x360_RGB24.rgb"));
244 TestFile(CONTAINER_UNKNOWN, GetTestDataFilePath("webm_vp8_track_entry")); 247 TestFile(CONTAINER_UNKNOWN, GetTestDataFilePath("webm_vp8_track_entry"));
245 } 248 }
246 249
247 } // namespace container_names 250 } // namespace container_names
248 251
249 } // namespace media 252 } // namespace media
OLDNEW
« media/base/container_names.cc ('K') | « media/base/container_names.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698