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/filters/ffmpeg_glue_unittest.cc

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 4 years, 12 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
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 <stdint.h>
6
5 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/macros.h"
6 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
7 #include "media/base/mock_filters.h" 10 #include "media/base/mock_filters.h"
8 #include "media/base/test_data_util.h" 11 #include "media/base/test_data_util.h"
9 #include "media/ffmpeg/ffmpeg_common.h" 12 #include "media/ffmpeg/ffmpeg_common.h"
10 #include "media/filters/ffmpeg_glue.h" 13 #include "media/filters/ffmpeg_glue.h"
11 #include "media/filters/in_memory_url_protocol.h" 14 #include "media/filters/in_memory_url_protocol.h"
12 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
13 16
14 using ::testing::_; 17 using ::testing::_;
15 using ::testing::DoAll; 18 using ::testing::DoAll;
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 ASSERT_GT(glue_->format_context()->nb_streams, 0u); 239 ASSERT_GT(glue_->format_context()->nb_streams, 0u);
237 240
238 // Pick the audio stream (1) so this works when the ffmpeg video decoders are 241 // Pick the audio stream (1) so this works when the ffmpeg video decoders are
239 // disabled. 242 // disabled.
240 AVCodecContext* context = glue_->format_context()->streams[1]->codec; 243 AVCodecContext* context = glue_->format_context()->streams[1]->codec;
241 ASSERT_EQ(0, avcodec_open2( 244 ASSERT_EQ(0, avcodec_open2(
242 context, avcodec_find_decoder(context->codec_id), NULL)); 245 context, avcodec_find_decoder(context->codec_id), NULL));
243 } 246 }
244 247
245 } // namespace media 248 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/ffmpeg_glue.cc ('k') | media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698