Fix a subsample incorrect size bug in mp4 encryption

Clear size was not correctly calculated for non-video slice nal units. Change-Id: I8371973a4ae346cbe4c1891ab274fb7a86983db8
2016-03-14 17:42:40 -07:00 · 2016-03-14 17:42:40 -07:00 · ef81be5f7b
parent 1863f5a569
commit ef81be5f7b
2 changed files with 2 additions and 1 deletions
--- a/packager/app/test/testdata/bear-640x360-hevc-v-cenc-golden.mp4
+++ b/packager/app/test/testdata/bear-640x360-hevc-v-cenc-golden.mp4
--- a/packager/media/formats/mp4/encrypting_fragmenter.cc
+++ b/packager/media/formats/mp4/encrypting_fragmenter.cc
@ -257,7 +257,8 @@ Status EncryptingFragmenter::EncryptSample(scoped_refptr<MediaSample> sample) {
          accumulated_clear_bytes = 0;
        } else {
          // For non-video-slice NAL units, don't encrypt.
-          accumulated_clear_bytes += nalu.header_size() + nalu.payload_size();
+          accumulated_clear_bytes +=
+              nalu_length_size_ + nalu.header_size() + nalu.payload_size();
        }
      }
      if (result != NaluReader::kEOStream)