cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to FFmpeg 20130718 snapshot. From 1.2 branch.

Browse Source 
ok sthen@
This commit is contained in:
brad 2013-08-19 14:38:29 +00:00
parent ee8bc4244b
commit 0321d4d3d4
6 changed files with 68 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/ffmpeg/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.99 2013/04/14 21:10:49 brad Exp $
# $OpenBSD: Makefile,v 1.100 2013/08/19 14:38:29 brad Exp $
COMMENT= audio/video converter and streamer
V= 20130319
V= 20130718
DISTNAME= ffmpeg-git-${V}
PKGNAME= ffmpeg-${V}
CATEGORIES= graphics multimedia

4
graphics/ffmpeg/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (ffmpeg-git-20130319.tar.xz) = 7WnaAMIJM0w6XxAtkdtQejWGlkYyGMlDeH23IpjqTYU=
SIZE (ffmpeg-git-20130319.tar.xz) = 4912640
SHA256 (ffmpeg-git-20130718.tar.xz) = mYtvHZil3mplwqNC0kJp28vYoAYut58HYGrWuXF73MM=
SIZE (ffmpeg-git-20130718.tar.xz) = 4913840

18
graphics/ffmpeg/patches/patch-configure
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.36 2013/04/08 17:06:56 brad Exp $
--- configure.orig Tue Mar 12 22:35:42 2013
+++ configure Wed Mar 13 01:50:12 2013
$OpenBSD: patch-configure,v 1.37 2013/08/19 14:38:29 brad Exp $
--- configure.orig Thu May 30 18:54:00 2013
+++ configure Wed Jun 12 16:02:21 2013
@@ -1438,7 +1438,6 @@ HAVE_LIST="
machine_ioctl_bt848_h
machine_ioctl_meteor_h
@ -9,7 +9,7 @@ $OpenBSD: patch-configure,v 1.36 2013/04/08 17:06:56 brad Exp $
MapViewOfFile
memalign
mkstemp
@@ -3229,7 +3228,7 @@ case $target_os in
@@ -3232,7 +3231,7 @@ case $target_os in
openbsd|bitrig)
disable symver
SHFLAGS='-shared'
@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.36 2013/04/08 17:06:56 brad Exp $
SLIB_INSTALL_LINKS=
oss_indev_extralibs="-lossaudio"
oss_outdev_extralibs="-lossaudio"
@@ -3516,7 +3515,7 @@ die_license_disabled version3 libvo_amrwbenc
@@ -3519,7 +3518,7 @@ die_license_disabled version3 libvo_amrwbenc
enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; }
@ -27,7 +27,7 @@ $OpenBSD: patch-configure,v 1.36 2013/04/08 17:06:56 brad Exp $
enable_pic() {
enable pic
@@ -4080,7 +4079,6 @@ enabled extra_warnings && check_cflags -Winline
@@ -4079,7 +4078,6 @@ enabled extra_warnings && check_cflags -Winline
# add some linker flags
check_ldflags -Wl,--warn-common
check_ldflags -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
@ -35,7 +35,7 @@ $OpenBSD: patch-configure,v 1.36 2013/04/08 17:06:56 brad Exp $
enabled xmm_clobber_test &&
check_ldflags -Wl,--wrap,avcodec_open2 \
@@ -4547,6 +4545,7 @@ pkgconfig_generate(){
@@ -4546,6 +4544,7 @@ pkgconfig_generate(){
version=$3
libs=$4
requires=$5
@ -43,7 +43,7 @@ $OpenBSD: patch-configure,v 1.36 2013/04/08 17:06:56 brad Exp $
enabled ${name#lib} || return 0
mkdir -p $name
cat <<EOF > $name/$name${build_suffix}.pc
@@ -4561,7 +4560,7 @@ Version: $version
@@ -4560,7 +4559,7 @@ Version: $version
Requires: $(enabled shared || echo $requires)
Requires.private: $(enabled shared && echo $requires)
Conflicts:
@ -52,7 +52,7 @@ $OpenBSD: patch-configure,v 1.36 2013/04/08 17:06:56 brad Exp $
Libs.private: $(enabled shared && echo $libs)
Cflags: -I\${includedir}
EOF
@@ -4597,15 +4596,15 @@ libavfilter_pc_deps=${libavfilter_pc_deps%, }
@@ -4596,15 +4595,15 @@ libavfilter_pc_deps=${libavfilter_pc_deps%, }
libavdevice_pc_deps="libavformat${build_suffix} = $LIBAVFORMAT_VERSION"
enabled lavfi_indev && prepend libavdevice_pc_deps "libavfilter${build_suffix} = $LIBAVFILTER_VERSION,"

24
graphics/ffmpeg/patches/patch-libavcodec_aacenc_c Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-libavcodec_aacenc_c,v 1.1 2013/08/19 14:38:29 brad Exp $
Fix erasure of surround channels.
--- libavcodec/aacenc.c.orig Wed Jun 12 19:09:49 2013
+++ libavcodec/aacenc.c Wed Jun 12 19:10:53 2013
@@ -593,7 +593,7 @@ static int aac_encode_frame(AVCodecContext *avctx, AVP
coeffs[ch] = cpe->ch[ch].coeffs;
s->psy.model->analyze(&s->psy, start_ch, coeffs, wi);
for (ch = 0; ch < chans; ch++) {
- s->cur_channel = start_ch * 2 + ch;
+ s->cur_channel = start_ch + ch;
s->coder->search_for_quantizers(avctx, s, &cpe->ch[ch], s->lambda);
}
cpe->common_window = 0;
@@ -609,7 +609,7 @@ static int aac_encode_frame(AVCodecContext *avctx, AVP
}
}
}
- s->cur_channel = start_ch * 2;
+ s->cur_channel = start_ch;
if (s->options.stereo_mode && cpe->common_window) {
if (s->options.stereo_mode > 0) {
IndividualChannelStream *ics = &cpe->ch[0].ics;

16
graphics/ffmpeg/patches/patch-libavcodec_aacps_c Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-libavcodec_aacps_c,v 1.1 2013/08/19 14:38:29 brad Exp $
Correct opdipd code to match spec. This fixes out of array reads.
--- libavcodec/aacps.c.orig Wed Jun 12 19:06:09 2013
+++ libavcodec/aacps.c Wed Jun 12 19:07:00 2013
@@ -823,7 +823,8 @@ static void stereo_processing(PSContext *ps, float (*l
h12 = H_LUT[iid_mapped[e][b] + 7 + 23 * ps->iid_quant][icc_mapped[e][b]][1];
h21 = H_LUT[iid_mapped[e][b] + 7 + 23 * ps->iid_quant][icc_mapped[e][b]][2];
h22 = H_LUT[iid_mapped[e][b] + 7 + 23 * ps->iid_quant][icc_mapped[e][b]][3];
- if (!PS_BASELINE && ps->enable_ipdopd && b < ps->nr_ipdopd_par) {
+
+ if (!PS_BASELINE && ps->enable_ipdopd && 2*b <= NR_PAR_BANDS[is34]) {
//The spec say says to only run this smoother when enable_ipdopd
//is set but the reference decoder appears to run it constantly
float h11i, h12i, h21i, h22i;

15
graphics/ffmpeg/patches/patch-libavcodec_aacpsy_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-libavcodec_aacpsy_c,v 1.1 2013/08/19 14:38:29 brad Exp $
Fix a rounding bug in channel bitrate computation.
--- libavcodec/aacpsy.c.orig Wed Jun 12 19:15:13 2013
+++ libavcodec/aacpsy.c Wed Jun 12 19:15:52 2013
@@ -312,7 +312,7 @@ static av_cold int psy_3gpp_init(FFPsyContext *ctx) {
AacPsyCoeffs *coeffs = pctx->psy_coef[j];
const uint8_t *band_sizes = ctx->bands[j];
float line_to_frequency = ctx->avctx->sample_rate / (j ? 256.f : 2048.0f);
- float avg_chan_bits = chan_bitrate / ctx->avctx->sample_rate * (j ? 128.0f : 1024.0f);
+ float avg_chan_bits = chan_bitrate * (j ? 128.0f : 1024.0f) / ctx->avctx->sample_rate;
/* reference encoder uses 2.4% here instead of 60% like the spec says */
float bark_pe = 0.024f * PSY_3GPP_BITS_TO_PE(avg_chan_bits) / num_bark;
float en_spread_low = j ? PSY_3GPP_EN_SPREAD_LOW_S : PSY_3GPP_EN_SPREAD_LOW_L;