| OLD | NEW |
|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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 #ifndef MEDIA_BASE_ANDROID_VIDEO_DECODER_JOB_H_ | 5 #ifndef MEDIA_BASE_ANDROID_VIDEO_DECODER_JOB_H_ |
| 6 #define MEDIA_BASE_ANDROID_VIDEO_DECODER_JOB_H_ | 6 #define MEDIA_BASE_ANDROID_VIDEO_DECODER_JOB_H_ |
| 7 | 7 |
| 8 #include <jni.h> | 8 #include <jni.h> |
| 9 #include <stddef.h> |
| 9 | 10 |
| 10 #include "base/macros.h" | 11 #include "base/macros.h" |
| 11 #include "media/base/android/media_decoder_job.h" | 12 #include "media/base/android/media_decoder_job.h" |
| 12 | 13 |
| 13 namespace media { | 14 namespace media { |
| 14 | 15 |
| 15 class VideoCodecBridge; | 16 class VideoCodecBridge; |
| 16 | 17 |
| 17 // Class for managing video decoding jobs. | 18 // Class for managing video decoding jobs. |
| 18 class VideoDecoderJob : public MediaDecoderJob { | 19 class VideoDecoderJob : public MediaDecoderJob { |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 | 68 |
| 68 // The surface object currently owned by the player. | 69 // The surface object currently owned by the player. |
| 69 gfx::ScopedJavaSurface surface_; | 70 gfx::ScopedJavaSurface surface_; |
| 70 | 71 |
| 71 DISALLOW_COPY_AND_ASSIGN(VideoDecoderJob); | 72 DISALLOW_COPY_AND_ASSIGN(VideoDecoderJob); |
| 72 }; | 73 }; |
| 73 | 74 |
| 74 } // namespace media | 75 } // namespace media |
| 75 | 76 |
| 76 #endif // MEDIA_BASE_ANDROID_VIDEO_DECODER_JOB_H_ | 77 #endif // MEDIA_BASE_ANDROID_VIDEO_DECODER_JOB_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1542013004:
Switch to standard integer types in media/, take 2. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master