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

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

Issue 1394303005: Android MediaCodecVideoDecoder: Limit max pending frames to number of input buffers (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 2 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
11 * this list of conditions and the following disclaimer in the documentation 11 * this list of conditions and the following disclaimer in the documentation
12 * and/or other materials provided with the distribution. 12 * and/or other materials provided with the distribution.
13 * 3. The name of the author may not be used to endorse or promote products 13 * 3. The name of the author may not be used to endorse or promote products
14 * derived from this software without specific prior written permission. 14 * derived from this software without specific prior written permission.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * 26 *
27 */ 27 */
28 28
29 #include <algorithm>
29 #include <vector> 30 #include <vector>
30 31
31 #include "talk/app/webrtc/java/jni/androidmediadecoder_jni.h" 32 #include "talk/app/webrtc/java/jni/androidmediadecoder_jni.h"
32 #include "talk/app/webrtc/java/jni/androidmediacodeccommon.h" 33 #include "talk/app/webrtc/java/jni/androidmediacodeccommon.h"
33 #include "talk/app/webrtc/java/jni/classreferenceholder.h" 34 #include "talk/app/webrtc/java/jni/classreferenceholder.h"
34 #include "talk/app/webrtc/java/jni/native_handle_impl.h" 35 #include "talk/app/webrtc/java/jni/native_handle_impl.h"
35 #include "talk/app/webrtc/java/jni/surfacetexturehelper_jni.h" 36 #include "talk/app/webrtc/java/jni/surfacetexturehelper_jni.h"
36 #include "webrtc/base/bind.h" 37 #include "webrtc/base/bind.h"
37 #include "webrtc/base/checks.h" 38 #include "webrtc/base/checks.h"
38 #include "webrtc/base/logging.h" 39 #include "webrtc/base/logging.h"
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 current_frames_ = 0; 334 current_frames_ = 0;
334 current_bytes_ = 0; 335 current_bytes_ = 0;
335 current_decoding_time_ms_ = 0; 336 current_decoding_time_ms_ = 0;
336 timestamps_.clear(); 337 timestamps_.clear();
337 ntp_times_ms_.clear(); 338 ntp_times_ms_.clear();
338 frame_rtc_times_ms_.clear(); 339 frame_rtc_times_ms_.clear();
339 340
340 jobjectArray input_buffers = (jobjectArray)GetObjectField( 341 jobjectArray input_buffers = (jobjectArray)GetObjectField(
341 jni, *j_media_codec_video_decoder_, j_input_buffers_field_); 342 jni, *j_media_codec_video_decoder_, j_input_buffers_field_);
342 size_t num_input_buffers = jni->GetArrayLength(input_buffers); 343 size_t num_input_buffers = jni->GetArrayLength(input_buffers);
344 max_pending_frames_ =
345 std::min(max_pending_frames_, static_cast<uint32_t>(num_input_buffers));
343 input_buffers_.resize(num_input_buffers); 346 input_buffers_.resize(num_input_buffers);
344 for (size_t i = 0; i < num_input_buffers; ++i) { 347 for (size_t i = 0; i < num_input_buffers; ++i) {
345 input_buffers_[i] = 348 input_buffers_[i] =
346 jni->NewGlobalRef(jni->GetObjectArrayElement(input_buffers, i)); 349 jni->NewGlobalRef(jni->GetObjectArrayElement(input_buffers, i));
347 if (CheckException(jni)) { 350 if (CheckException(jni)) {
348 ALOGE << "NewGlobalRef error - fallback to SW codec."; 351 ALOGE << "NewGlobalRef error - fallback to SW codec.";
349 sw_fallback_required_ = true; 352 sw_fallback_required_ = true;
350 return WEBRTC_VIDEO_CODEC_ERROR; 353 return WEBRTC_VIDEO_CODEC_ERROR;
351 } 354 }
352 } 355 }
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after
829 } 832 }
830 833
831 void MediaCodecVideoDecoderFactory::DestroyVideoDecoder( 834 void MediaCodecVideoDecoderFactory::DestroyVideoDecoder(
832 webrtc::VideoDecoder* decoder) { 835 webrtc::VideoDecoder* decoder) {
833 ALOGD << "Destroy video decoder."; 836 ALOGD << "Destroy video decoder.";
834 delete decoder; 837 delete decoder;
835 } 838 }
836 839
837 } // namespace webrtc_jni 840 } // namespace webrtc_jni
838 841
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698