August 2015 - ffmpeg-cvslog - lists.ffmpeg.org

lavf/avio: add ffurl_accept and ffurl_handshake
by git＠videolan.org 01 Aug '15

01 Aug '15

ffmpeg | branch: master | Stephan Holljes <klaxa1337(a)googlemail.com> | Fri Jul 3 02:24:18 2015 +0200| [5125e4b53f71ca3c7d34c5812425f6f2fb963375] | committer: Stephan Holljes lavf/avio: add ffurl_accept and ffurl_handshake Signed-off-by: Stephan Holljes <klaxa1337(a)googlemail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5125e4b53f71ca3c7… --- libavformat/avio.c | 20 ++++++++++++++++++++ libavformat/url.h | 25 +++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/libavformat/avio.c b/libavformat/avio.c index c188adc..21713d9 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -211,6 +211,26 @@ int ffurl_connect(URLContext *uc, AVDictionary **options) return 0; } +int ffurl_accept(URLContext *s, URLContext **c) +{ + av_assert0(!*c); + if (s->prot->url_accept) + return s->prot->url_accept(s, c); + return AVERROR(EBADF); +} + +int ffurl_handshake(URLContext *c) +{ + int ret; + if (c->prot->url_handshake) { + ret = c->prot->url_handshake(c); + if (ret) + return ret; + } + c->is_connected = 1; + return 0; +} + #define URL_SCHEME_CHARS \ "abcdefghijklmnopqrstuvwxyz" \ "ABCDEFGHIJKLMNOPQRSTUVWXYZ" \ diff --git a/libavformat/url.h b/libavformat/url.h index 99a3201..391e3bc 100644 --- a/libavformat/url.h +++ b/libavformat/url.h @@ -58,6 +58,8 @@ typedef struct URLProtocol { * for those nested protocols. */ int (*url_open2)(URLContext *h, const char *url, int flags, AVDictionary **options); + int (*url_accept)(URLContext *s, URLContext **c); + int (*url_handshake)(URLContext *c); /** * Read data from the protocol. @@ -140,6 +142,29 @@ int ffurl_open(URLContext **puc, const char *filename, int flags, const AVIOInterruptCB *int_cb, AVDictionary **options); /** + * Accept an URLContext c on an URLContext s + * + * @param s server context + * @param c client context, must be unallocated. + * @return >= 0 on success, ff_neterrno() on failure. + */ +int ffurl_accept(URLContext *s, URLContext **c); + +/** + * Perform one step of the protocol handshake to accept a new client. + * See avio_handshake() for details. + * Implementations should try to return decreasing values. + * If the protocol uses an underlying protocol, the underlying handshake is + * usually the first step, and the return value can be: + * (largest value for this protocol) + (return value from other protocol) + * + * @param c the client context + * @return >= 0 on success or a negative value corresponding + * to an AVERROR code on failure + */ +int ffurl_handshake(URLContext *c); + +/** * Read up to size bytes from the resource accessed by h, and store * the read bytes in buf. *

1 0

lavf/network: split ff_listen_bind into ff_listen and ff_accept
by git＠videolan.org 01 Aug '15

01 Aug '15

ffmpeg | branch: master | Stephan Holljes <klaxa1337(a)googlemail.com> | Fri Jul 3 02:22:25 2015 +0200| [cf6c871beec9039dc6d7ebda57358161d64062c3] | committer: Stephan Holljes lavf/network: split ff_listen_bind into ff_listen and ff_accept Signed-off-by: Stephan Holljes <klaxa1337(a)googlemail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cf6c871beec9039dc… --- libavformat/network.c | 27 +++++++++++++++++++++------ libavformat/network.h | 20 ++++++++++++++++++++ 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/libavformat/network.c b/libavformat/network.c index 47ade8c..7a326d2 100644 --- a/libavformat/network.c +++ b/libavformat/network.c @@ -187,12 +187,11 @@ int ff_socket(int af, int type, int proto) return fd; } -int ff_listen_bind(int fd, const struct sockaddr *addr, - socklen_t addrlen, int timeout, URLContext *h) +int ff_listen(int fd, const struct sockaddr *addr, + socklen_t addrlen) { int ret; int reuse = 1; - struct pollfd lp = { fd, POLLIN, 0 }; if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof(reuse))) { av_log(NULL, AV_LOG_WARNING, "setsockopt(SO_REUSEADDR) failed\n"); } @@ -203,6 +202,13 @@ int ff_listen_bind(int fd, const struct sockaddr *addr, ret = listen(fd, 1); if (ret) return ff_neterrno(); + return ret; +} + +int ff_accept(int fd, int timeout, URLContext *h) +{ + int ret; + struct pollfd lp = { fd, POLLIN, 0 }; ret = ff_poll_interrupt(&lp, 1, timeout, &h->interrupt_callback); if (ret < 0) @@ -211,15 +217,24 @@ int ff_listen_bind(int fd, const struct sockaddr *addr, ret = accept(fd, NULL, NULL); if (ret < 0) return ff_neterrno(); - - closesocket(fd); - if (ff_socket_nonblock(ret, 1) < 0) av_log(NULL, AV_LOG_DEBUG, "ff_socket_nonblock failed\n"); return ret; } +int ff_listen_bind(int fd, const struct sockaddr *addr, + socklen_t addrlen, int timeout, URLContext *h) +{ + int ret; + if ((ret = ff_listen(fd, addr, addrlen)) < 0) + return ret; + if ((ret = ff_accept(fd, timeout, h)) < 0) + return ret; + closesocket(fd); + return ret; +} + int ff_listen_connect(int fd, const struct sockaddr *addr, socklen_t addrlen, int timeout, URLContext *h, int will_try_next) diff --git a/libavformat/network.h b/libavformat/network.h index 86fb656..f83c796 100644 --- a/libavformat/network.h +++ b/libavformat/network.h @@ -255,6 +255,26 @@ int ff_listen_bind(int fd, const struct sockaddr *addr, URLContext *h); /** + * Bind to a file descriptor to an address without accepting connections. + * @param fd First argument of bind(). + * @param addr Second argument of bind(). + * @param addrlen Third argument of bind(). + * @return 0 on success or an AVERROR on failure. + */ +int ff_listen(int fd, const struct sockaddr *addr, socklen_t addrlen); + +/** + * Poll for a single connection on the passed file descriptor. + * @param fd The listening socket file descriptor. + * @param timeout Polling timeout in milliseconds. + * @param h URLContext providing interrupt check + * callback and logging context. + * @return A non-blocking file descriptor on success + * or an AVERROR on failure. + */ +int ff_accept(int fd, int timeout, URLContext *h); + +/** * Connect to a file descriptor and poll for result. * * @param fd First argument of connect(),

1 0

aacenc: remove redundant argument from coder functions
by git＠videolan.org 01 Aug '15

01 Aug '15

ffmpeg | branch: master | Rostislav Pehlivanov <atomnuker(a)gmail.com> | Wed Jul 29 05:44:24 2015 +0100| [6d175158e914f042d4dc3a67688456cd0b9d8c62] | committer: Michael Niedermayer aacenc: remove redundant argument from coder functions This commit removes a redundant argument from the functions in aaccoder. The argument lambda was redundant as it was just a copy of s->lambda, to which all functions have access to anyway. This cleans up the function pointers a bit which is helpful as there are a lot of other search_for_* functions under development and with them populated it gets messy. Reviewed-by: Claudio Freire <klaussfreire(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6d175158e914f042d… --- libavcodec/aaccoder.c | 12 ++++++------ libavcodec/aacenc.c | 6 +++--- libavcodec/aacenc.h | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libavcodec/aaccoder.c b/libavcodec/aaccoder.c index eb58342..0441971 100644 --- a/libavcodec/aaccoder.c +++ b/libavcodec/aaccoder.c @@ -1177,10 +1177,10 @@ static void search_for_quantizers_fast(AVCodecContext *avctx, AACEncContext *s, sce->sf_idx[(w+w2)*16+g] = sce->sf_idx[w*16+g]; } -static void search_for_pns(AACEncContext *s, AVCodecContext *avctx, SingleChannelElement *sce, - const float lambda) +static void search_for_pns(AACEncContext *s, AVCodecContext *avctx, SingleChannelElement *sce) { int start = 0, w, w2, g; + const float lambda = s->lambda; const float freq_mult = avctx->sample_rate/(1024.0f/sce->ics.num_windows)/2.0f; const float spread_threshold = NOISE_SPREAD_THRESHOLD*(lambda/120.f); const float thr_mult = NOISE_LAMBDA_NUMERATOR/lambda; @@ -1214,8 +1214,7 @@ static void search_for_pns(AACEncContext *s, AVCodecContext *avctx, SingleChanne } } -static void search_for_is(AACEncContext *s, AVCodecContext *avctx, ChannelElement *cpe, - const float lambda) +static void search_for_is(AACEncContext *s, AVCodecContext *avctx, ChannelElement *cpe) { float IS[128]; float *L34 = s->scoefs + 128*0, *R34 = s->scoefs + 128*1; @@ -1224,6 +1223,7 @@ static void search_for_is(AACEncContext *s, AVCodecContext *avctx, ChannelElemen SingleChannelElement *sce1 = &cpe->ch[1]; int start = 0, count = 0, i, w, w2, g; const float freq_mult = avctx->sample_rate/(1024.0f/sce0->ics.num_windows)/2.0f; + const float lambda = s->lambda; for (w = 0; w < 128; w++) if (sce1->band_type[w] >= INTENSITY_BT2) @@ -1312,12 +1312,12 @@ static void search_for_is(AACEncContext *s, AVCodecContext *avctx, ChannelElemen cpe->is_mode = !!count; } -static void search_for_ms(AACEncContext *s, ChannelElement *cpe, - const float lambda) +static void search_for_ms(AACEncContext *s, ChannelElement *cpe) { int start = 0, i, w, w2, g; float M[128], S[128]; float *L34 = s->scoefs, *R34 = s->scoefs + 128, *M34 = s->scoefs + 128*2, *S34 = s->scoefs + 128*3; + const float lambda = s->lambda; SingleChannelElement *sce0 = &cpe->ch[0]; SingleChannelElement *sce1 = &cpe->ch[1]; if (!cpe->common_window) diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index ee1a835..152203f 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -696,7 +696,7 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, if (s->options.pns && s->coder->search_for_pns) { for (ch = 0; ch < chans; ch++) { s->cur_channel = start_ch + ch; - s->coder->search_for_pns(s, avctx, &cpe->ch[ch], s->lambda); + s->coder->search_for_pns(s, avctx, &cpe->ch[ch]); } } s->cur_channel = start_ch; @@ -707,11 +707,11 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, for (g = 0; g < ics->num_swb; g++) cpe->ms_mask[w*16+g] = 1; } else if (s->coder->search_for_ms) { - s->coder->search_for_ms(s, cpe, s->lambda); + s->coder->search_for_ms(s, cpe); } } if (chans > 1 && s->options.intensity_stereo && s->coder->search_for_is) { - s->coder->search_for_is(s, avctx, cpe, s->lambda); + s->coder->search_for_is(s, avctx, cpe); if (cpe->is_mode) is_mode = 1; } if (s->coder->set_special_band_scalefactors) diff --git a/libavcodec/aacenc.h b/libavcodec/aacenc.h index 1f05aab..80ada07 100644 --- a/libavcodec/aacenc.h +++ b/libavcodec/aacenc.h @@ -56,9 +56,9 @@ typedef struct AACCoefficientsEncoder { void (*quantize_and_encode_band)(struct AACEncContext *s, PutBitContext *pb, const float *in, int size, int scale_idx, int cb, const float lambda, int rtz); void (*set_special_band_scalefactors)(struct AACEncContext *s, SingleChannelElement *sce); - void (*search_for_pns)(struct AACEncContext *s, AVCodecContext *avctx, SingleChannelElement *sce, const float lambda); - void (*search_for_ms)(struct AACEncContext *s, ChannelElement *cpe, const float lambda); - void (*search_for_is)(struct AACEncContext *s, AVCodecContext *avctx, ChannelElement *cpe, const float lambda); + void (*search_for_pns)(struct AACEncContext *s, AVCodecContext *avctx, SingleChannelElement *sce); + void (*search_for_ms)(struct AACEncContext *s, ChannelElement *cpe); + void (*search_for_is)(struct AACEncContext *s, AVCodecContext *avctx, ChannelElement *cpe); } AACCoefficientsEncoder; extern AACCoefficientsEncoder ff_aac_coders[];

1 0

avcodec/libx264: expose nv21 input support
by git＠videolan.org 01 Aug '15

01 Aug '15

ffmpeg | branch: master | Yu Xiaolei <dreifachstein(a)gmail.com> | Sat Aug 1 06:42:15 2015 +0800| [2ef6994ef6354425e0b1c229b05a0b2ffe0928e9] | committer: Michael Niedermayer avcodec/libx264: expose nv21 input support libx264 added support for NV21 input recently. Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ef6994ef6354425e… --- libavcodec/libx264.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 5da816e..c017685 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -381,6 +381,9 @@ static int convert_pix_fmt(enum AVPixelFormat pix_fmt) case AV_PIX_FMT_NV12: return X264_CSP_NV12; case AV_PIX_FMT_NV16: case AV_PIX_FMT_NV20: return X264_CSP_NV16; +#ifdef X264_CSP_NV21 + case AV_PIX_FMT_NV21: return X264_CSP_NV21; +#endif }; return 0; } @@ -770,6 +773,9 @@ static const enum AVPixelFormat pix_fmts_8bit[] = { AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_NV12, AV_PIX_FMT_NV16, +#ifdef X264_CSP_NV21 + AV_PIX_FMT_NV21, +#endif AV_PIX_FMT_NONE }; static const enum AVPixelFormat pix_fmts_9bit[] = {

1 0