media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h - Issue 1915443003: Replace scoped_ptr with std::unique_ptr in //media.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h

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, 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.h ('k') | media/cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h

diff --git a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h

index 761a225ff55844f6b062acc494a615dac08b8ac0..96a61ba588a0be64f6b30aca45872de82aa43576 100644

--- a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h

+++ b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h

@@ -7,9 +7,10 @@

#include <stdint.h>

+#include <memory>

#include "base/compiler_specific.h"

#include "base/macros.h"

-#include "base/memory/scoped_ptr.h"

#include "media/cdm/ppapi/external_clear_key/cdm_video_decoder.h"

#include "media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h"

#include "media/ffmpeg/ffmpeg_deleters.h"

@@ -47,8 +48,8 @@ class FFmpegCdmVideoDecoder : public CdmVideoDecoder {

void ReleaseFFmpegResources();

// FFmpeg structures owned by this object.

- scoped_ptr<AVCodecContext, ScopedPtrAVFreeContext> codec_context_;

- scoped_ptr<AVFrame, ScopedPtrAVFreeFrame> av_frame_;

+ std::unique_ptr<AVCodecContext, ScopedPtrAVFreeContext> codec_context_;

+ std::unique_ptr<AVFrame, ScopedPtrAVFreeFrame> av_frame_;

bool is_initialized_;