1. 02 Sep, 2016 12 commits
  2. 01 Sep, 2016 6 commits
  3. 31 Aug, 2016 7 commits
  4. 30 Aug, 2016 3 commits
    • Umair Khan's avatar
      9fbf0660
    • Simon Hailes's avatar
      avformat/crypto: add seeking support on read · a13a81a0
      Simon Hailes authored
      cyrpto allows reading of data which has been aes-128-cbc encrypted given a key and an iv. But it did not handle filetypes which require seeking... e.g. it failed on an encrypted .mp4 file.
      
      example:
      take 25.mp4 created with:
      ffmpeg -f lavfi -i sine=frequency=1000:beep_factor=2:r=48000:duration=720.0 -f lavfi -i testsrc=duration=720.0:rate=25 -vcodec libx264 -cmp 22 -timecode 10:00:00:00 -r 25 -y out\25.mp4
      
      encrypt with:
      openssl enc -aes-128-cbc -K 12345678901234567890123456789012 -iv 12345678901234567890123456789012 -in 25.mp4 -out 25.enc
      then to transcode in ffmpeg:
      ffmpeg -key 12345678901234567890123456789012 -iv 12345678901234567890123456789012 -i crypto:25.enc -vcodec mpeg4 -r 25 -y 25dec.mp4
      
      prior to this modification, the transcode would fail.
      
      Note also:  crypto previously maked both reads and writes as streamed, which caused the whole file
      to be read before the transcode started.  Now, for read only, if the underlying layer is not marked as streamed,
      then crypto is not.  This should enable efficient reading of encrypted containers which require seeking.
      Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
      a13a81a0
    • Simon Hailes's avatar
      libavformat/crypto - encourage reads of 4096 bytes · a2fcacc8
      Simon Hailes authored
      the current implementation reads in chunks of 149x16=2384 bytes.
      Seems more logical for it to read in chunks of 4096
      Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
      a2fcacc8
  5. 29 Aug, 2016 1 commit
  6. 30 Aug, 2016 1 commit
  7. 29 Aug, 2016 9 commits
  8. 28 Aug, 2016 1 commit
    • Thomas Hebb's avatar
      avformat/mov: aax: pass proper AVClass to av_log() · a37e6dd2
      Thomas Hebb authored
      av_log() expects its first parameter to be a pointer to a struct whose
      first element is a pointer to an AVClass. In what I can only imagine is
      a typo, one call to av_log() in the AAX decryption code instead passes
      a pointer to an AVSHA struct, which doesn't even contain a pointer as
      its first element, much less a pointer to an AVClass. Change the call to
      pass the current MOVContext, as surrounding calls do.
      
      The incorrect AVClass was causing mpv to emit the warning "av_log
      callback called with bad parameters" when playing an .aax file.
      Signed-off-by: 's avatarThomas Hebb <tommyhebb@gmail.com>
      Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
      a37e6dd2