for #738, decode mp4 video track boxes.

ossrs · Feb 2, 2017 · 128a1fd · 128a1fd
1 parent 5a84b6c
commit 128a1fd
Show file tree

Hide file tree

Showing 4 changed files with 300 additions and 117 deletions.
diff --git a/trunk/research/librtmp/srs_ingest_mp4.c b/trunk/research/librtmp/srs_ingest_mp4.c
@@ -236,6 +236,7 @@ int proxy(srs_mp4_t mp4, srs_rtmp_t ortmp)
     int ret = 0;
 
     if ((ret = srs_mp4_init_demuxer(mp4)) != 0) {
+        srs_human_trace("init demuxer failed. ret=%d", ret);
         return ret;
     }
     if ((ret = connect_oc(ortmp)) != 0) {

diff --git a/trunk/src/kernel/srs_kernel_error.hpp b/trunk/src/kernel/srs_kernel_error.hpp
@@ -247,6 +247,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define ERROR_MP4_BOX_ILLEGAL_TYPE          3071
 #define ERROR_MP4_BOX_ILLEGAL_SCHEMA        3072
 #define ERROR_MP4_BOX_STRING                3073
+#define ERROR_MP4_BOX_ILLEGAL_BRAND         3074
+#define ERROR_MP4_NOT_NON_SEEKABLE          3075
 
 ///////////////////////////////////////////////////////
 // HTTP/StreamCaster/KAFKA protocol error.