media/base/android/media_codec_player.h - Issue 1535193003: Add missing macros includes in media/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: media/base/android/media_codec_player.h

Issue 1535193003: Add missing macros includes in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years 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/base/android/media_codec_bridge.h ('k') | media/base/android/media_codec_video_decoder.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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_ANDROID_MEDIA_CODEC_PLAYER_H_	5 #ifndef MEDIA_BASE_ANDROID_MEDIA_CODEC_PLAYER_H_

6 #define MEDIA_BASE_ANDROID_MEDIA_CODEC_PLAYER_H_	6 #define MEDIA_BASE_ANDROID_MEDIA_CODEC_PLAYER_H_

7	7

8 #include "base/android/scoped_java_ref.h"	8 #include "base/android/scoped_java_ref.h"

	9 #include "base/macros.h"

9 #include "base/memory/scoped_ptr.h"	10 #include "base/memory/scoped_ptr.h"

10 #include "base/memory/weak_ptr.h"	11 #include "base/memory/weak_ptr.h"

11 #include "base/threading/thread.h"	12 #include "base/threading/thread.h"

12 #include "base/time/default_tick_clock.h"	13 #include "base/time/default_tick_clock.h"

13 #include "media/base/android/demuxer_android.h"	14 #include "media/base/android/demuxer_android.h"

14 #include "media/base/android/media_drm_bridge.h"	15 #include "media/base/android/media_drm_bridge.h"

15 #include "media/base/android/media_player_android.h"	16 #include "media/base/android/media_player_android.h"

16 #include "media/base/android/media_statistics.h"	17 #include "media/base/android/media_statistics.h"

17 #include "media/base/demuxer_stream.h"	18 #include "media/base/demuxer_stream.h"

18 #include "media/base/media_export.h"	19 #include "media/base/media_export.h"

(...skipping 396 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
415 base::WeakPtr<MediaCodecPlayer> media_weak_this_;	416 base::WeakPtr<MediaCodecPlayer> media_weak_this_;

416 // NOTE: Weak pointers must be invalidated before all other member variables.	417 // NOTE: Weak pointers must be invalidated before all other member variables.

417 base::WeakPtrFactory<MediaCodecPlayer> media_weak_factory_;	418 base::WeakPtrFactory<MediaCodecPlayer> media_weak_factory_;

418	419

419 DISALLOW_COPY_AND_ASSIGN(MediaCodecPlayer);	420 DISALLOW_COPY_AND_ASSIGN(MediaCodecPlayer);

420 };	421 };

421	422

422 } // namespace media	423 } // namespace media

423	424

424 #endif // MEDIA_BASE_ANDROID_MEDIA_CODEC_PLAYER_H_	425 #endif // MEDIA_BASE_ANDROID_MEDIA_CODEC_PLAYER_H_

OLD	NEW