| 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 | 9 |
| 10 #include "base/macros.h" |
| 10 #include "media/base/android/media_decoder_job.h" | 11 #include "media/base/android/media_decoder_job.h" |
| 11 | 12 |
| 12 namespace media { | 13 namespace media { |
| 13 | 14 |
| 14 class VideoCodecBridge; | 15 class VideoCodecBridge; |
| 15 | 16 |
| 16 // Class for managing video decoding jobs. | 17 // Class for managing video decoding jobs. |
| 17 class VideoDecoderJob : public MediaDecoderJob { | 18 class VideoDecoderJob : public MediaDecoderJob { |
| 18 public: | 19 public: |
| 19 // Create a new VideoDecoderJob instance. | 20 // Create a new VideoDecoderJob instance. |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 | 67 |
| 67 // The surface object currently owned by the player. | 68 // The surface object currently owned by the player. |
| 68 gfx::ScopedJavaSurface surface_; | 69 gfx::ScopedJavaSurface surface_; |
| 69 | 70 |
| 70 DISALLOW_COPY_AND_ASSIGN(VideoDecoderJob); | 71 DISALLOW_COPY_AND_ASSIGN(VideoDecoderJob); |
| 71 }; | 72 }; |
| 72 | 73 |
| 73 } // namespace media | 74 } // namespace media |
| 74 | 75 |
| 75 #endif // MEDIA_BASE_ANDROID_VIDEO_DECODER_JOB_H_ | 76 #endif // MEDIA_BASE_ANDROID_VIDEO_DECODER_JOB_H_ |
| OLD | NEW |