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

Side by Side Diff: media/ffmpeg/ffmpeg_common_unittest.cc

Issue 1915443003: Replace scoped_ptr with std::unique_ptr in //media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptr-media-base
Patch Set: scopedptr-media: rebase Created 4 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/ffmpeg/ffmpeg_common.cc ('k') | media/midi/midi_manager_alsa.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include <cstring> 8 #include <cstring>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/files/memory_mapped_file.h" 11 #include "base/files/memory_mapped_file.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/memory/scoped_ptr.h"
15 #include "media/base/audio_decoder_config.h" 14 #include "media/base/audio_decoder_config.h"
16 #include "media/base/media.h" 15 #include "media/base/media.h"
17 #include "media/base/media_util.h" 16 #include "media/base/media_util.h"
18 #include "media/base/test_data_util.h" 17 #include "media/base/test_data_util.h"
19 #include "media/base/video_decoder_config.h" 18 #include "media/base/video_decoder_config.h"
20 #include "media/ffmpeg/ffmpeg_common.h" 19 #include "media/ffmpeg/ffmpeg_common.h"
21 #include "media/filters/ffmpeg_glue.h" 20 #include "media/filters/ffmpeg_glue.h"
22 #include "media/filters/in_memory_url_protocol.h" 21 #include "media/filters/in_memory_url_protocol.h"
23 #include "testing/gtest/include/gtest/gtest.h" 22 #include "testing/gtest/include/gtest/gtest.h"
24 23
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 // values; diff should verify. 264 // values; diff should verify.
266 #if 0 265 #if 0
267 printf("<enum name=\"FFmpegCodecHashes\" type=\"int\">\n"); 266 printf("<enum name=\"FFmpegCodecHashes\" type=\"int\">\n");
268 for (const auto& kv : sorted_hashes) 267 for (const auto& kv : sorted_hashes)
269 printf(" <int value=\"%d\" label=\"%s\"/>\n", kv.first, kv.second); 268 printf(" <int value=\"%d\" label=\"%s\"/>\n", kv.first, kv.second);
270 printf("</enum>\n"); 269 printf("</enum>\n");
271 #endif 270 #endif
272 } 271 }
273 272
274 } // namespace media 273 } // namespace media
OLDNEW
« no previous file with comments | « media/ffmpeg/ffmpeg_common.cc ('k') | media/midi/midi_manager_alsa.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698