Skip to content

F
ffmpeg.wasm-core
Switch branch/tag
  1. 16 Jun, 2015 3 commits
    • George Boyle's avatar
      avcodec/flacenc: Fix Invalid Rice order · 2469ed32
      George Boyle authored 
      Fixes ticket #4628.

The problem arose, in the sample file at least, in the last block where the
minimum and maximum Rice partition orders were both 0. In that case, and any
other where pmax == pmin, the original UINT32_MAX placeholder value for
bits[opt_porder] was getting overwritten before the comparison to check if the
current partition order is a new optimal, so the correct partition order and
RiceContext params were not being set.
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      2469ed32
    • James Zern's avatar
      doc/muxers.texi: properly insert {}s in example · 202188a2
      James Zern authored 
      use '@{' / '@}', fixes compile errors:
*** '{' without macro. Before: 1:-'.'}
*** '}' without opening '{' before:

since:
907ac20a avformat/hlsenc: added HLS encryption
Signed-off-by: 's avatarJames Zern <jzern@google.com>
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      202188a2
    • Christian Suloway's avatar
      avformat/hlsenc: added HLS encryption · 907ac20a
      Christian Suloway authored 
      Added HLS encryption with -hls_key_info_file <key_info_file> option. The
first line of key_info_file specifies the key URI written to the
playlist. The key URL is used to access the encryption key during
playback. The second line specifies the path to the key file used to
obtain the key during the encryption process. The key file is read as a
single packed array of 16 octets in binary format. The optional third
line specifies the initialization vector (IV) as a hexadecimal string to
be used instead of the segment sequence number (default) for encryption.
Changes to key_info_file will result in segment encryption with the new
key/IV and an entry in the playlist for the new key URI/IV.

Key info file format:
<key URI>
<key file path>
<IV> (optional)

Example key URIs:
http://server/file.key
/path/to/file.key
file.key

Example key file paths:
file.key
/path/to/file.key

Example IV:
0123456789ABCDEF0123456789ABCDEF

Example:
ffmpeg -f lavfi -i testsrc -c:v h264 -hls_key_info_file file.keyinfo
foo.m3u8

file.keyinfo:
http://server/file.key
/path/to/file.key
0123456789ABCDEF0123456789ABCDEF

Example shell script:
BASE_URL=${1:-'.'}
openssl rand 16 > file.key
echo $BASE_URL/file.key > file.keyinfo
echo file.key >> file.keyinfo
echo $(openssl rand -hex 16) >> file.keyinfo
ffmpeg -f lavfi -re -i testsrc -c:v h264 -hls_flags delete_segments \
  -hls_key_info_file file.keyinfo out.m3u8
--
Signed-off-by: 's avatarChristian Suloway <csuloway@globaleagleent.com>
Signed-off-by: 's avatarDan Dennedy <dan@dennedy.org>
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      907ac20a
  3. 15 Jun, 2015 26 commits
  5. 14 Jun, 2015 11 commits