From 2b298de1003dfc6e0e76b8782cab6edaac0ad47c Mon Sep 17 00:00:00 2001
From: Alex Glaznev <glaznev@google.com>
Date: Thu, 8 Oct 2015 16:21:50 -0700
Subject: [PATCH] Reset media codec thread when Encoder/Decoder object is
 created.

Review URL: https://codereview.webrtc.org/1389373004 .

Cr-Commit-Position: refs/heads/master@{#10230}
---
 .../webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java    | 4 +++-
 .../webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java    | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java b/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java
index f6dcf15b35..c1fff94ed6 100644
--- a/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java
+++ b/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java
@@ -96,7 +96,9 @@ public class MediaCodecVideoDecoder {
   private TextureListener textureListener;
   private Surface surface = null;
 
-  private MediaCodecVideoDecoder() { }
+  private MediaCodecVideoDecoder() {
+    mediaCodecThread = null;
+  }
 
   // Helper struct for findVp8Decoder() below.
   private static class DecoderProperties {
diff --git a/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java b/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java
index 705dcd1a35..f043f9b5de 100644
--- a/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java
+++ b/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java
@@ -101,7 +101,9 @@ public class MediaCodecVideoEncoder {
   // SPS and PPS NALs (Config frame) for H.264.
   private ByteBuffer configData = null;
 
-  private MediaCodecVideoEncoder() {}
+  private MediaCodecVideoEncoder() {
+    mediaCodecThread = null;
+  }
 
   // Helper struct for findHwEncoder() below.
   private static class EncoderProperties {