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

Side by Side Diff: talk/app/webrtc/java/jni/androidmediadecoder_jni.cc

Issue 1413333002: system_wrappers: rename interface -> include (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased again! Created 5 years, 1 month 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
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2015 Google Inc. 3 * Copyright 2015 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 23 matching lines...) Expand all
34 #include "talk/app/webrtc/java/jni/classreferenceholder.h" 34 #include "talk/app/webrtc/java/jni/classreferenceholder.h"
35 #include "talk/app/webrtc/java/jni/native_handle_impl.h" 35 #include "talk/app/webrtc/java/jni/native_handle_impl.h"
36 #include "webrtc/base/bind.h" 36 #include "webrtc/base/bind.h"
37 #include "webrtc/base/checks.h" 37 #include "webrtc/base/checks.h"
38 #include "webrtc/base/logging.h" 38 #include "webrtc/base/logging.h"
39 #include "webrtc/base/scoped_ref_ptr.h" 39 #include "webrtc/base/scoped_ref_ptr.h"
40 #include "webrtc/base/thread.h" 40 #include "webrtc/base/thread.h"
41 #include "webrtc/base/timeutils.h" 41 #include "webrtc/base/timeutils.h"
42 #include "webrtc/common_video/interface/i420_buffer_pool.h" 42 #include "webrtc/common_video/interface/i420_buffer_pool.h"
43 #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" 43 #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h"
44 #include "webrtc/system_wrappers/interface/logcat_trace_context.h" 44 #include "webrtc/system_wrappers/include/logcat_trace_context.h"
45 #include "webrtc/system_wrappers/interface/tick_util.h" 45 #include "webrtc/system_wrappers/include/tick_util.h"
46 #include "third_party/libyuv/include/libyuv/convert.h" 46 #include "third_party/libyuv/include/libyuv/convert.h"
47 #include "third_party/libyuv/include/libyuv/convert_from.h" 47 #include "third_party/libyuv/include/libyuv/convert_from.h"
48 #include "third_party/libyuv/include/libyuv/video_common.h" 48 #include "third_party/libyuv/include/libyuv/video_common.h"
49 49
50 using rtc::Bind; 50 using rtc::Bind;
51 using rtc::Thread; 51 using rtc::Thread;
52 using rtc::ThreadManager; 52 using rtc::ThreadManager;
53 using rtc::scoped_ptr; 53 using rtc::scoped_ptr;
54 54
55 using webrtc::CodecSpecificInfo; 55 using webrtc::CodecSpecificInfo;
(...skipping 791 matching lines...) Expand 10 before | Expand all | Expand 10 after
847 } 847 }
848 848
849 void MediaCodecVideoDecoderFactory::DestroyVideoDecoder( 849 void MediaCodecVideoDecoderFactory::DestroyVideoDecoder(
850 webrtc::VideoDecoder* decoder) { 850 webrtc::VideoDecoder* decoder) {
851 ALOGD << "Destroy video decoder."; 851 ALOGD << "Destroy video decoder.";
852 delete decoder; 852 delete decoder;
853 } 853 }
854 854
855 } // namespace webrtc_jni 855 } // namespace webrtc_jni
856 856
OLDNEW
« no previous file with comments | « talk/app/webrtc/java/jni/androidmediacodeccommon.h ('k') | talk/app/webrtc/java/jni/androidmediaencoder_jni.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698