From: Lajos Molnar <lajos@google.com>
Date: Thu, 4 Sep 2014 18:45:26 +0000 (-0700)
Subject: stagefright: allow P-frames spacing of 0 and 1
X-Git-Tag: android-x86-6.0-r1~852^2~389^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5da491bb05009e2062d8a98a153594bb3ff15188;p=android-x86%2Fframeworks-av.git

stagefright: allow P-frames spacing of 0 and 1

Bug: 17387418
Change-Id: Ib966496b4ca220d96fb3741c29002c13cd2db848
---

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 19a5908fcd..9b03b71221 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -2313,7 +2313,6 @@ static OMX_U32 setPFramesSpacing(int32_t iFramesInterval, int32_t frameRate) {
         return 0;
     }
     OMX_U32 ret = frameRate * iFramesInterval;
-    CHECK(ret > 1);
     return ret;
 }
 
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 78758daf7a..a8806c8e5b 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -994,7 +994,6 @@ static OMX_U32 setPFramesSpacing(int32_t iFramesInterval, int32_t frameRate) {
         return 0;
     }
     OMX_U32 ret = frameRate * iFramesInterval - 1;
-    CHECK(ret > 1);
     return ret;
 }