for bug #288, refine the codec decode info frame failed. 1.0.21

trunk/src/app/srs_app_avc_aac.cpp

@@ -337,6 +337,13 @@ int SrsAvcAacCodec::video_avc_demux(char* data, int size, SrsCodecSample* sample
     
     sample->frame_type = (SrsCodecVideoAVCFrame)frame_type;
     
+    // ignore info frame without error,
+    // @see https://github.com/winlinvip/simple-rtmp-server/issues/288#issuecomment-69863909
+    if (sample->frame_type == SrsCodecVideoAVCFrameVideoInfoFrame) {
+        srs_warn("hls igone the info frame, ret=%d", ret);
+        return ret;
+    }
+    
     // only support h.264/avc
     if (codec_id != SrsCodecVideoAVC) {
         ret = ERROR_HLS_DECODE_ERROR;

trunk/src/app/srs_app_hls.cpp

@@ -1491,14 +1491,16 @@ int SrsHls::on_video(SrsSharedPtrMessage* video)
     
     sample->clear();
     if ((ret = codec->video_avc_demux(video->payload, video->size, sample)) != ERROR_SUCCESS) {
-        if (sample->frame_type == SrsCodecVideoAVCFrameVideoInfoFrame) {
-            srs_warn("hls igone the info frame, ret=%d", ret);
-            return ERROR_SUCCESS;
-        }
         srs_error("hls codec demux video failed. ret=%d", ret);
         return ret;
     }
     
+    // ignore info frame,
+    // @see https://github.com/winlinvip/simple-rtmp-server/issues/288#issuecomment-69863909
+    if (sample->frame_type == SrsCodecVideoAVCFrameVideoInfoFrame) {
+        return ret;
+    }
+    
     if (codec->video_codec_id != SrsCodecVideoAVC) {
         return ret;
     }

trunk/src/core/srs_core.hpp

@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // current release version
 #define VERSION_MAJOR       1
 #define VERSION_MINOR       0
-#define VERSION_REVISION    20
+#define VERSION_REVISION    21
 // server info.
 #define RTMP_SIG_SRS_KEY "SRS"
 #define RTMP_SIG_SRS_ROLE "origin/edge server"