commit cee3e53631f2e838b88aecc95f129f90e29095f3
author Sami Kalliomäki <sakal@webrtc.org> Fri Oct 13 15:20:32 2017 +0200
committer Commit Bot <commit-bot@chromium.org> Fri Oct 13 14:23:07 2017 +0000
tree b8707142e497544c0924b7c95e1a7f05d7166d68
parent ae012cf8b892ef8cdcb18ac6ca69321c2419bc1e

Android: Cache implementation name in VideoDecoderWrapper.

This fixes a crash caused by access to already freed memory returned
by VideoDecoderWrapper::ImplementationName method.

Bug: webrtc:7760
Change-Id: Ia4b020d1dd861e6a45637abde35f12951b7c43ea
Reviewed-on: https://webrtc-review.googlesource.com/9420
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20290}

sdk/android/src/jni/videodecoderwrapper.h

diff --git a/sdk/android/src/jni/videodecoderwrapper.h b/sdk/android/src/jni/videodecoderwrapper.h
index 2da6892..978be87 100644
--- a/sdk/android/src/jni/videodecoderwrapper.h
+++ b/sdk/android/src/jni/videodecoderwrapper.h
@@ -72,6 +72,8 @@
 
   rtc::Optional<uint8_t> ParseQP(const EncodedImage& input_image);
 
+  std::string GetImplementationName(JNIEnv* jni) const;
+
   VideoCodec codec_settings_;
   int32_t number_of_cores_;
 
@@ -80,6 +82,7 @@
   std::deque<FrameExtraInfo> frame_extra_infos_;
   bool qp_parsing_enabled_;
   H264BitstreamParser h264_bitstream_parser_;
+  std::string implementation_name_;
 
   DecodedImageCallback* callback_;