June 2010 - ffmpeg-cvslog - lists.ffmpeg.org

r23914 - trunk/libavcodec/mpeg12.c
by subversion＠mplayerhq.hu 30 Jun '10

30 Jun '10

Author: cehoyos Date: Wed Jun 30 23:46:03 2010 New Revision: 23914 Log: Do not skip one of three bits zero padding. Patch by Daniel Kristjansson, danielk cuymedia net Modified: trunk/libavcodec/mpeg12.c Modified: trunk/libavcodec/mpeg12.c ============================================================================== --- trunk/libavcodec/mpeg12.c Wed Jun 30 23:45:51 2010 (r23913) +++ trunk/libavcodec/mpeg12.c Wed Jun 30 23:46:03 2010 (r23914) @@ -1440,7 +1440,7 @@ static void mpeg_decode_sequence_display w= get_bits(&s->gb, 14); skip_bits(&s->gb, 1); //marker h= get_bits(&s->gb, 14); - skip_bits(&s->gb, 1); //marker + // remaining 3 bits are zero padding s1->pan_scan.width= 16*w; s1->pan_scan.height=16*h;

1 0

r23913 - trunk/libavcodec/dct32.c
by subversion＠mplayerhq.hu 30 Jun '10

30 Jun '10

Author: mru Date: Wed Jun 30 23:45:51 2010 New Revision: 23913 Log: Add missed file dct32.c Added: trunk/libavcodec/dct32.c Added: trunk/libavcodec/dct32.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/libavcodec/dct32.c Wed Jun 30 23:45:51 2010 (r23913) @@ -0,0 +1,267 @@ +/* + * Template for the Discrete Cosine Transform for 32 samples + * Copyright (c) 2001, 2002 Fabrice Bellard + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifdef DCT32_FLOAT +# define FIXHR(x) ((float)(x)) +# define MULH3(x, y, s) ((s)*(y)*(x)) +# define INTFLOAT float +#endif + + +/* tab[i][j] = 1.0 / (2.0 * cos(pi*(2*k+1) / 2^(6 - j))) */ + +/* cos(i*pi/64) */ + +#define COS0_0 FIXHR(0.50060299823519630134/2) +#define COS0_1 FIXHR(0.50547095989754365998/2) +#define COS0_2 FIXHR(0.51544730992262454697/2) +#define COS0_3 FIXHR(0.53104259108978417447/2) +#define COS0_4 FIXHR(0.55310389603444452782/2) +#define COS0_5 FIXHR(0.58293496820613387367/2) +#define COS0_6 FIXHR(0.62250412303566481615/2) +#define COS0_7 FIXHR(0.67480834145500574602/2) +#define COS0_8 FIXHR(0.74453627100229844977/2) +#define COS0_9 FIXHR(0.83934964541552703873/2) +#define COS0_10 FIXHR(0.97256823786196069369/2) +#define COS0_11 FIXHR(1.16943993343288495515/4) +#define COS0_12 FIXHR(1.48416461631416627724/4) +#define COS0_13 FIXHR(2.05778100995341155085/8) +#define COS0_14 FIXHR(3.40760841846871878570/8) +#define COS0_15 FIXHR(10.19000812354805681150/32) + +#define COS1_0 FIXHR(0.50241928618815570551/2) +#define COS1_1 FIXHR(0.52249861493968888062/2) +#define COS1_2 FIXHR(0.56694403481635770368/2) +#define COS1_3 FIXHR(0.64682178335999012954/2) +#define COS1_4 FIXHR(0.78815462345125022473/2) +#define COS1_5 FIXHR(1.06067768599034747134/4) +#define COS1_6 FIXHR(1.72244709823833392782/4) +#define COS1_7 FIXHR(5.10114861868916385802/16) + +#define COS2_0 FIXHR(0.50979557910415916894/2) +#define COS2_1 FIXHR(0.60134488693504528054/2) +#define COS2_2 FIXHR(0.89997622313641570463/2) +#define COS2_3 FIXHR(2.56291544774150617881/8) + +#define COS3_0 FIXHR(0.54119610014619698439/2) +#define COS3_1 FIXHR(1.30656296487637652785/4) + +#define COS4_0 FIXHR(0.70710678118654752439/2) + +/* butterfly operator */ +#define BF(a, b, c, s)\ +{\ + tmp0 = val##a + val##b;\ + tmp1 = val##a - val##b;\ + val##a = tmp0;\ + val##b = MULH3(tmp1, c, 1<<(s));\ +} + +#define BF0(a, b, c, s)\ +{\ + tmp0 = tab[a] + tab[b];\ + tmp1 = tab[a] - tab[b];\ + val##a = tmp0;\ + val##b = MULH3(tmp1, c, 1<<(s));\ +} + +#define BF1(a, b, c, d)\ +{\ + BF(a, b, COS4_0, 1);\ + BF(c, d,-COS4_0, 1);\ + val##c += val##d;\ +} + +#define BF2(a, b, c, d)\ +{\ + BF(a, b, COS4_0, 1);\ + BF(c, d,-COS4_0, 1);\ + val##c += val##d;\ + val##a += val##c;\ + val##c += val##b;\ + val##b += val##d;\ +} + +#define ADD(a, b) val##a += val##b + +/* DCT32 without 1/sqrt(2) coef zero scaling. */ +static void dct32(INTFLOAT *out, const INTFLOAT *tab) +{ + INTFLOAT tmp0, tmp1; + + INTFLOAT val0 , val1 , val2 , val3 , val4 , val5 , val6 , val7 , + val8 , val9 , val10, val11, val12, val13, val14, val15, + val16, val17, val18, val19, val20, val21, val22, val23, + val24, val25, val26, val27, val28, val29, val30, val31; + + /* pass 1 */ + BF0( 0, 31, COS0_0 , 1); + BF0(15, 16, COS0_15, 5); + /* pass 2 */ + BF( 0, 15, COS1_0 , 1); + BF(16, 31,-COS1_0 , 1); + /* pass 1 */ + BF0( 7, 24, COS0_7 , 1); + BF0( 8, 23, COS0_8 , 1); + /* pass 2 */ + BF( 7, 8, COS1_7 , 4); + BF(23, 24,-COS1_7 , 4); + /* pass 3 */ + BF( 0, 7, COS2_0 , 1); + BF( 8, 15,-COS2_0 , 1); + BF(16, 23, COS2_0 , 1); + BF(24, 31,-COS2_0 , 1); + /* pass 1 */ + BF0( 3, 28, COS0_3 , 1); + BF0(12, 19, COS0_12, 2); + /* pass 2 */ + BF( 3, 12, COS1_3 , 1); + BF(19, 28,-COS1_3 , 1); + /* pass 1 */ + BF0( 4, 27, COS0_4 , 1); + BF0(11, 20, COS0_11, 2); + /* pass 2 */ + BF( 4, 11, COS1_4 , 1); + BF(20, 27,-COS1_4 , 1); + /* pass 3 */ + BF( 3, 4, COS2_3 , 3); + BF(11, 12,-COS2_3 , 3); + BF(19, 20, COS2_3 , 3); + BF(27, 28,-COS2_3 , 3); + /* pass 4 */ + BF( 0, 3, COS3_0 , 1); + BF( 4, 7,-COS3_0 , 1); + BF( 8, 11, COS3_0 , 1); + BF(12, 15,-COS3_0 , 1); + BF(16, 19, COS3_0 , 1); + BF(20, 23,-COS3_0 , 1); + BF(24, 27, COS3_0 , 1); + BF(28, 31,-COS3_0 , 1); + + + + /* pass 1 */ + BF0( 1, 30, COS0_1 , 1); + BF0(14, 17, COS0_14, 3); + /* pass 2 */ + BF( 1, 14, COS1_1 , 1); + BF(17, 30,-COS1_1 , 1); + /* pass 1 */ + BF0( 6, 25, COS0_6 , 1); + BF0( 9, 22, COS0_9 , 1); + /* pass 2 */ + BF( 6, 9, COS1_6 , 2); + BF(22, 25,-COS1_6 , 2); + /* pass 3 */ + BF( 1, 6, COS2_1 , 1); + BF( 9, 14,-COS2_1 , 1); + BF(17, 22, COS2_1 , 1); + BF(25, 30,-COS2_1 , 1); + + /* pass 1 */ + BF0( 2, 29, COS0_2 , 1); + BF0(13, 18, COS0_13, 3); + /* pass 2 */ + BF( 2, 13, COS1_2 , 1); + BF(18, 29,-COS1_2 , 1); + /* pass 1 */ + BF0( 5, 26, COS0_5 , 1); + BF0(10, 21, COS0_10, 1); + /* pass 2 */ + BF( 5, 10, COS1_5 , 2); + BF(21, 26,-COS1_5 , 2); + /* pass 3 */ + BF( 2, 5, COS2_2 , 1); + BF(10, 13,-COS2_2 , 1); + BF(18, 21, COS2_2 , 1); + BF(26, 29,-COS2_2 , 1); + /* pass 4 */ + BF( 1, 2, COS3_1 , 2); + BF( 5, 6,-COS3_1 , 2); + BF( 9, 10, COS3_1 , 2); + BF(13, 14,-COS3_1 , 2); + BF(17, 18, COS3_1 , 2); + BF(21, 22,-COS3_1 , 2); + BF(25, 26, COS3_1 , 2); + BF(29, 30,-COS3_1 , 2); + + /* pass 5 */ + BF1( 0, 1, 2, 3); + BF2( 4, 5, 6, 7); + BF1( 8, 9, 10, 11); + BF2(12, 13, 14, 15); + BF1(16, 17, 18, 19); + BF2(20, 21, 22, 23); + BF1(24, 25, 26, 27); + BF2(28, 29, 30, 31); + + /* pass 6 */ + + ADD( 8, 12); + ADD(12, 10); + ADD(10, 14); + ADD(14, 9); + ADD( 9, 13); + ADD(13, 11); + ADD(11, 15); + + out[ 0] = val0; + out[16] = val1; + out[ 8] = val2; + out[24] = val3; + out[ 4] = val4; + out[20] = val5; + out[12] = val6; + out[28] = val7; + out[ 2] = val8; + out[18] = val9; + out[10] = val10; + out[26] = val11; + out[ 6] = val12; + out[22] = val13; + out[14] = val14; + out[30] = val15; + + ADD(24, 28); + ADD(28, 26); + ADD(26, 30); + ADD(30, 25); + ADD(25, 29); + ADD(29, 27); + ADD(27, 31); + + out[ 1] = val16 + val24; + out[17] = val17 + val25; + out[ 9] = val18 + val26; + out[25] = val19 + val27; + out[ 5] = val20 + val28; + out[21] = val21 + val29; + out[13] = val22 + val30; + out[29] = val23 + val31; + out[ 3] = val24 + val20; + out[19] = val25 + val21; + out[11] = val26 + val22; + out[27] = val27 + val23; + out[ 7] = val28 + val18; + out[23] = val29 + val19; + out[15] = val30 + val17; + out[31] = val31; +}

1 0

r23822 - in trunk: ffserver.c libavformat/avformat.h libavformat/gopher.c libavformat/http.c libavformat/internal.h libavformat/mmst.c libavformat/rtmpproto.c libavformat/rtpproto.c libavformat/rts...
by subversion＠mplayerhq.hu 30 Jun '10

30 Jun '10

Author: mru Date: Sun Jun 27 16:16:46 2010 New Revision: 23822 Log: Make ff_url_split() public ff_url_split() is retained as an alias, as it was used by ffserver, to avoid breaking ABI compatibility with it. Modified: trunk/ffserver.c trunk/libavformat/avformat.h trunk/libavformat/gopher.c trunk/libavformat/http.c trunk/libavformat/internal.h trunk/libavformat/mmst.c trunk/libavformat/rtmpproto.c trunk/libavformat/rtpproto.c trunk/libavformat/rtsp.c trunk/libavformat/sdp.c trunk/libavformat/tcp.c trunk/libavformat/udp.c trunk/libavformat/utils.c Modified: trunk/ffserver.c ============================================================================== --- trunk/ffserver.c Sun Jun 27 14:21:12 2010 (r23821) +++ trunk/ffserver.c Sun Jun 27 16:16:46 2010 (r23822) @@ -2978,7 +2978,7 @@ static void rtsp_cmd_describe(HTTPContex struct sockaddr_in my_addr; /* find which url is asked */ - ff_url_split(NULL, 0, NULL, 0, NULL, 0, NULL, path1, sizeof(path1), url); + av_url_split(NULL, 0, NULL, 0, NULL, 0, NULL, path1, sizeof(path1), url); path = path1; if (*path == '/') path++; @@ -3055,7 +3055,7 @@ static void rtsp_cmd_setup(HTTPContext * RTSPActionServerSetup setup; /* find which url is asked */ - ff_url_split(NULL, 0, NULL, 0, NULL, 0, NULL, path1, sizeof(path1), url); + av_url_split(NULL, 0, NULL, 0, NULL, 0, NULL, path1, sizeof(path1), url); path = path1; if (*path == '/') path++; @@ -3198,7 +3198,7 @@ static HTTPContext *find_rtp_session_wit return NULL; /* find which url is asked */ - ff_url_split(NULL, 0, NULL, 0, NULL, 0, NULL, path1, sizeof(path1), url); + av_url_split(NULL, 0, NULL, 0, NULL, 0, NULL, path1, sizeof(path1), url); path = path1; if (*path == '/') path++; Modified: trunk/libavformat/avformat.h ============================================================================== --- trunk/libavformat/avformat.h Sun Jun 27 14:21:12 2010 (r23821) +++ trunk/libavformat/avformat.h Sun Jun 27 16:16:46 2010 (r23822) @@ -1185,6 +1185,32 @@ int64_t av_gen_search(AVFormatContext *s int av_set_parameters(AVFormatContext *s, AVFormatParameters *ap); /** + * Split a URL string into components. + * + * The pointers to buffers for storing individual components may be null, + * in order to ignore that component. Buffers for components not found are + * set to empty strings. If the port is not found, it is set to a negative + * value. + * + * @param proto the buffer for the protocol + * @param proto_size the size of the proto buffer + * @param authorization the buffer for the authorization + * @param authorization_size the size of the authorization buffer + * @param hostname the buffer for the host name + * @param hostname_size the size of the hostname buffer + * @param port_ptr a pointer to store the port number in + * @param path the buffer for the path + * @param path_size the size of the path buffer + * @param url the URL to split + */ +void av_url_split(char *proto, int proto_size, + char *authorization, int authorization_size, + char *hostname, int hostname_size, + int *port_ptr, + char *path, int path_size, + const char *url); + +/** * Allocates the stream private data and writes the stream header to an * output media file. * Modified: trunk/libavformat/gopher.c ============================================================================== --- trunk/libavformat/gopher.c Sun Jun 27 14:21:12 2010 (r23821) +++ trunk/libavformat/gopher.c Sun Jun 27 16:16:46 2010 (r23822) @@ -90,7 +90,7 @@ static int gopher_open(URLContext *h, co h->priv_data = s; /* needed in any case to build the host string */ - ff_url_split(NULL, 0, auth, sizeof(auth), hostname, sizeof(hostname), &port, + av_url_split(NULL, 0, auth, sizeof(auth), hostname, sizeof(hostname), &port, path, sizeof(path), uri); if (port < 0) Modified: trunk/libavformat/http.c ============================================================================== --- trunk/libavformat/http.c Sun Jun 27 14:21:12 2010 (r23821) +++ trunk/libavformat/http.c Sun Jun 27 16:16:46 2010 (r23822) @@ -105,12 +105,12 @@ static int http_open_cnx(URLContext *h) /* fill the dest addr */ redo: /* needed in any case to build the host string */ - ff_url_split(NULL, 0, auth, sizeof(auth), hostname, sizeof(hostname), &port, + av_url_split(NULL, 0, auth, sizeof(auth), hostname, sizeof(hostname), &port, path1, sizeof(path1), s->location); ff_url_join(hoststr, sizeof(hoststr), NULL, NULL, hostname, port, NULL); if (use_proxy) { - ff_url_split(NULL, 0, auth, sizeof(auth), hostname, sizeof(hostname), &port, + av_url_split(NULL, 0, auth, sizeof(auth), hostname, sizeof(hostname), &port, NULL, 0, proxy_path); path = s->location; } else { Modified: trunk/libavformat/internal.h ============================================================================== --- trunk/libavformat/internal.h Sun Jun 27 14:21:12 2010 (r23821) +++ trunk/libavformat/internal.h Sun Jun 27 16:16:46 2010 (r23822) @@ -89,27 +89,9 @@ int ff_probe_input_buffer(ByteIOContext const char *filename, void *logctx, unsigned int offset, unsigned int max_probe_size); +#if LIBAVFORMAT_VERSION_MAJOR < 53 /** - * Splits a URL string into components. To reassemble components back into - * a URL, use ff_url_join instead of using snprintf directly. - * - * The pointers to buffers for storing individual components may be null, - * in order to ignore that component. Buffers for components not found are - * set to empty strings. If the port isn't found, it is set to a negative - * value. - * - * @see ff_url_join - * - * @param proto the buffer for the protocol - * @param proto_size the size of the proto buffer - * @param authorization the buffer for the authorization - * @param authorization_size the size of the authorization buffer - * @param hostname the buffer for the host name - * @param hostname_size the size of the hostname buffer - * @param port_ptr a pointer to store the port number in - * @param path the buffer for the path - * @param path_size the size of the path buffer - * @param url the URL to split + * @deprecated use av_url_split() instead */ void ff_url_split(char *proto, int proto_size, char *authorization, int authorization_size, @@ -117,15 +99,16 @@ void ff_url_split(char *proto, int proto int *port_ptr, char *path, int path_size, const char *url); +#endif /** * Assembles a URL string from components. This is the reverse operation - * of ff_url_split. + * of av_url_split. * * Note, this requires networking to be initialized, so the caller must * ensure ff_network_init has been called. * - * @see ff_url_split + * @see av_url_split * * @param str the buffer to fill with the url * @param size the size of the str buffer Modified: trunk/libavformat/mmst.c ============================================================================== --- trunk/libavformat/mmst.c Sun Jun 27 14:21:12 2010 (r23821) +++ trunk/libavformat/mmst.c Sun Jun 27 16:16:46 2010 (r23822) @@ -581,7 +581,7 @@ static int mms_open(URLContext *h, const return AVERROR(ENOMEM); // only for MMS over TCP, so set proto = NULL - ff_url_split(NULL, 0, NULL, 0, + av_url_split(NULL, 0, NULL, 0, mms->host, sizeof(mms->host), &port, mms->path, sizeof(mms->path), uri); Modified: trunk/libavformat/rtmpproto.c ============================================================================== --- trunk/libavformat/rtmpproto.c Sun Jun 27 14:21:12 2010 (r23821) +++ trunk/libavformat/rtmpproto.c Sun Jun 27 16:16:46 2010 (r23822) @@ -813,7 +813,7 @@ static int rtmp_open(URLContext *s, cons s->priv_data = rt; rt->is_input = !(flags & URL_WRONLY); - ff_url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname), &port, + av_url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname), &port, path, sizeof(path), s->filename); if (port < 0) Modified: trunk/libavformat/rtpproto.c ============================================================================== --- trunk/libavformat/rtpproto.c Sun Jun 27 14:21:12 2010 (r23821) +++ trunk/libavformat/rtpproto.c Sun Jun 27 16:16:46 2010 (r23822) @@ -66,7 +66,7 @@ int rtp_set_remote_url(URLContext *h, co char buf[1024]; char path[1024]; - ff_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, + av_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, path, sizeof(path), uri); ff_url_join(buf, sizeof(buf), "udp", NULL, hostname, port, "%s", path); @@ -146,7 +146,7 @@ static int rtp_open(URLContext *h, const return AVERROR(ENOMEM); h->priv_data = s; - ff_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &rtp_port, + av_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &rtp_port, path, sizeof(path), uri); /* extract parameters */ ttl = -1; Modified: trunk/libavformat/rtsp.c ============================================================================== --- trunk/libavformat/rtsp.c Sun Jun 27 14:21:12 2010 (r23821) +++ trunk/libavformat/rtsp.c Sun Jun 27 16:16:46 2010 (r23822) @@ -327,7 +327,7 @@ static void sdp_parse_line(AVFormatConte rtsp_st = st->priv_data; /* XXX: may need to add full url resolution */ - ff_url_split(proto, sizeof(proto), NULL, 0, NULL, 0, + av_url_split(proto, sizeof(proto), NULL, 0, NULL, 0, NULL, NULL, 0, p); if (proto[0] == '\0') { /* relative control URL */ @@ -1366,7 +1366,7 @@ int ff_rtsp_connect(AVFormatContext *s) redirect: rt->control_transport = RTSP_MODE_PLAIN; /* extract hostname and port */ - ff_url_split(NULL, 0, auth, sizeof(auth), + av_url_split(NULL, 0, auth, sizeof(auth), host, sizeof(host), &port, path, sizeof(path), s->filename); if (*auth) { av_strlcpy(rt->auth, auth, sizeof(rt->auth)); Modified: trunk/libavformat/sdp.c ============================================================================== --- trunk/libavformat/sdp.c Sun Jun 27 14:21:12 2010 (r23821) +++ trunk/libavformat/sdp.c Sun Jun 27 16:16:46 2010 (r23822) @@ -109,7 +109,7 @@ static int sdp_get_address(char *dest_ad const char *p; char proto[32]; - ff_url_split(proto, sizeof(proto), NULL, 0, dest_addr, size, &port, NULL, 0, url); + av_url_split(proto, sizeof(proto), NULL, 0, dest_addr, size, &port, NULL, 0, url); *ttl = 0; Modified: trunk/libavformat/tcp.c ============================================================================== --- trunk/libavformat/tcp.c Sun Jun 27 14:21:12 2010 (r23821) +++ trunk/libavformat/tcp.c Sun Jun 27 16:16:46 2010 (r23822) @@ -45,7 +45,7 @@ static int tcp_open(URLContext *h, const char hostname[1024],proto[1024],path[1024]; char portstr[10]; - ff_url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname), + av_url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname), &port, path, sizeof(path), uri); if (strcmp(proto,"tcp") || port <= 0 || port >= 65536) return AVERROR(EINVAL); Modified: trunk/libavformat/udp.c ============================================================================== --- trunk/libavformat/udp.c Sun Jun 27 14:21:12 2010 (r23821) +++ trunk/libavformat/udp.c Sun Jun 27 16:16:46 2010 (r23822) @@ -266,7 +266,7 @@ int udp_set_remote_url(URLContext *h, co char hostname[256]; int port; - ff_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, NULL, 0, uri); + av_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, NULL, 0, uri); /* set the destination address */ s->dest_addr_len = udp_set_url(&s->dest_addr, hostname, port); @@ -347,9 +347,9 @@ static int udp_open(URLContext *h, const } /* fill the dest addr */ - ff_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, NULL, 0, uri); + av_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, NULL, 0, uri); - /* XXX: fix ff_url_split */ + /* XXX: fix av_url_split */ if (hostname[0] == '\0' || hostname[0] == '?') { /* only accepts null hostname if input */ if (flags & URL_WRONLY) Modified: trunk/libavformat/utils.c ============================================================================== --- trunk/libavformat/utils.c Sun Jun 27 14:21:12 2010 (r23821) +++ trunk/libavformat/utils.c Sun Jun 27 16:16:46 2010 (r23822) @@ -3493,6 +3493,8 @@ void av_pkt_dump_log(void *avcl, int lev pkt_dump_internal(avcl, NULL, level, pkt, dump_payload); } +#if LIBAVFORMAT_VERSION_MAJOR < 53 +attribute_deprecated void ff_url_split(char *proto, int proto_size, char *authorization, int authorization_size, char *hostname, int hostname_size, @@ -3500,6 +3502,22 @@ void ff_url_split(char *proto, int proto char *path, int path_size, const char *url) { + av_url_split(proto, proto_size, + authorization, authorization_size, + hostname, hostname_size, + port_ptr, + path, path_size, + url); +} +#endif + +void av_url_split(char *proto, int proto_size, + char *authorization, int authorization_size, + char *hostname, int hostname_size, + int *port_ptr, + char *path, int path_size, + const char *url) +{ const char *p, *ls, *at, *col, *brk; if (port_ptr) *port_ptr = -1;

7 15

r23910 - trunk/libavutil/error.h
by subversion＠mplayerhq.hu 30 Jun '10

30 Jun '10

Author: mru Date: Wed Jun 30 22:09:52 2010 New Revision: 23910 Log: Improve av_strerror() documentation Modified: trunk/libavutil/error.h Modified: trunk/libavutil/error.h ============================================================================== --- trunk/libavutil/error.h Wed Jun 30 22:09:48 2010 (r23909) +++ trunk/libavutil/error.h Wed Jun 30 22:09:52 2010 (r23910) @@ -63,6 +63,8 @@ * error. Even in case of failure av_strerror() will print a generic * error message indicating the errnum provided to errbuf. * + * @param errnum error code to describe + * @param errbuf buffer to which description is written * @param errbuf_size the size in bytes of errbuf * @return 0 on success, a negative value if a description for errnum * cannot be found

1 0

r23909 - trunk/libavutil/common.h
by subversion＠mplayerhq.hu 30 Jun '10

30 Jun '10

Author: mru Date: Wed Jun 30 22:09:48 2010 New Revision: 23909 Log: Improve GET_UTF{8,16} documentation Modified: trunk/libavutil/common.h Modified: trunk/libavutil/common.h ============================================================================== --- trunk/libavutil/common.h Wed Jun 30 22:09:44 2010 (r23908) +++ trunk/libavutil/common.h Wed Jun 30 22:09:48 2010 (r23909) @@ -192,18 +192,16 @@ static inline av_const int av_ceil_log2( #define MKTAG(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((d) << 24)) #define MKBETAG(a,b,c,d) ((d) | ((c) << 8) | ((b) << 16) | ((a) << 24)) -/*! - * \def GET_UTF8(val, GET_BYTE, ERROR) - * Convert a UTF-8 character (up to 4 bytes long) to its 32-bit UCS-4 encoded form - * \param val is the output and should be of type uint32_t. It holds the converted - * UCS-4 character and should be a left value. - * \param GET_BYTE gets UTF-8 encoded bytes from any proper source. It can be - * a function or a statement whose return value or evaluated value is of type - * uint8_t. It will be executed up to 4 times for values in the valid UTF-8 range, - * and up to 7 times in the general case. - * \param ERROR action that should be taken when an invalid UTF-8 byte is returned - * from GET_BYTE. It should be a statement that jumps out of the macro, - * like exit(), goto, return, break, or continue. +/** + * Convert a UTF-8 character (up to 4 bytes) to its 32-bit UCS-4 encoded form. + * + * @param val Output value, must be an lvalue of type uint32_t. + * @param GET_BYTE Expression reading one byte from the input. + * Evaluated up to 7 times (4 for the currently + * assigned Unicode range). With a memory buffer + * input, this could be *ptr++. + * @param ERROR Expression to be evaluated on invalid input, + * typically a goto statement. */ #define GET_UTF8(val, GET_BYTE, ERROR)\ val= GET_BYTE;\ @@ -220,17 +218,14 @@ static inline av_const int av_ceil_log2( }\ } -/*! - * \def GET_UTF16(val, GET_16BIT, ERROR) - * Convert a UTF-16 character (2 or 4 bytes) to its 32-bit UCS-4 encoded form - * \param val is the output and should be of type uint32_t. It holds the converted - * UCS-4 character and should be a left value. - * \param GET_16BIT gets two bytes of UTF-16 encoded data converted to native endianness. - * It can be a function or a statement whose return value or evaluated value is of type - * uint16_t. It will be executed up to 2 times. - * \param ERROR action that should be taken when an invalid UTF-16 surrogate is - * returned from GET_BYTE. It should be a statement that jumps out of the macro, - * like exit(), goto, return, break, or continue. +/** + * Convert a UTF-16 character (2 or 4 bytes) to its 32-bit UCS-4 encoded form. + * + * @param val Output value, must be an lvalue of type uint32_t. + * @param GET_16BIT Expression returning two bytes of UTF-16 data converted + * to native byte order. Evaluated one or two times. + * @param ERROR Expression to be evaluated on invalid input, + * typically a goto statement. */ #define GET_UTF16(val, GET_16BIT, ERROR)\ val = GET_16BIT;\

1 0

r23908 - trunk/libavutil/aes.h
by subversion＠mplayerhq.hu 30 Jun '10

30 Jun '10

Author: mru Date: Wed Jun 30 22:09:44 2010 New Revision: 23908 Log: aes: improve av_aes_crypt() documentation Modified: trunk/libavutil/aes.h Modified: trunk/libavutil/aes.h ============================================================================== --- trunk/libavutil/aes.h Wed Jun 30 22:09:40 2010 (r23907) +++ trunk/libavutil/aes.h Wed Jun 30 22:09:44 2010 (r23908) @@ -35,7 +35,7 @@ struct AVAES; int av_aes_init(struct AVAES *a, const uint8_t *key, int key_bits, int decrypt); /** - * Encrypt / decrypt. + * Encrypt or decrypt a buffer using a previously initialized context. * @param count number of 16 byte blocks * @param dst destination array, can be equal to src * @param src source array, can be equal to dst

1 0

r23907 - trunk/libavutil/adler32.h
by subversion＠mplayerhq.hu 30 Jun '10

30 Jun '10

Author: mru Date: Wed Jun 30 22:09:40 2010 New Revision: 23907 Log: adler32: add API documentation Modified: trunk/libavutil/adler32.h Modified: trunk/libavutil/adler32.h ============================================================================== --- trunk/libavutil/adler32.h Wed Jun 30 22:09:37 2010 (r23906) +++ trunk/libavutil/adler32.h Wed Jun 30 22:09:40 2010 (r23907) @@ -24,6 +24,18 @@ #include <stdint.h> #include "attributes.h" +/** + * Calculate the Adler32 checksum of a buffer. + * + * Passing the return value to a subsequent av_adler32_update() call + * allows the checksum of multiple buffers to be calculated as though + * they were concatenated. + * + * @param adler initial checksum value + * @param buf pointer to input buffer + * @param len size of input buffer + * @return updated checksum + */ unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf, unsigned int len) av_pure;

1 0

r23906 - trunk/libavcodec/avcodec.h
by subversion＠mplayerhq.hu 30 Jun '10

30 Jun '10

Author: mru Date: Wed Jun 30 22:09:37 2010 New Revision: 23906 Log: Improve av_resample() documentation Modified: trunk/libavcodec/avcodec.h Modified: trunk/libavcodec/avcodec.h ============================================================================== --- trunk/libavcodec/avcodec.h Wed Jun 30 22:09:32 2010 (r23905) +++ trunk/libavcodec/avcodec.h Wed Jun 30 22:09:37 2010 (r23906) @@ -2989,7 +2989,7 @@ void audio_resample_close(ReSampleContex struct AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_length, int log2_phase_count, int linear, double cutoff); /** - * resamples. + * Resample an array of samples using a previously configured context. * @param src an array of unconsumed samples * @param consumed the number of samples of src which have been consumed are returned here * @param src_size the number of unconsumed samples available

1 0

r23905 - trunk/libavutil/base64.h
by subversion＠mplayerhq.hu 30 Jun '10

30 Jun '10

Author: mru Date: Wed Jun 30 22:09:32 2010 New Revision: 23905 Log: base64: improve documentation Modified: trunk/libavutil/base64.h Modified: trunk/libavutil/base64.h ============================================================================== --- trunk/libavutil/base64.h Wed Jun 30 17:38:06 2010 (r23904) +++ trunk/libavutil/base64.h Wed Jun 30 22:09:32 2010 (r23905) @@ -24,25 +24,25 @@ #include <stdint.h> /** - * Decode the base64-encoded string in in and put the decoded - * data in out. + * Decode a base64-encoded string. * - * @param out_size size in bytes of the out buffer, it should be at - * least 3/4 of the length of in - * @return the number of bytes written, or a negative value in case of - * error + * @param out buffer for decoded data + * @param in null-terminated input string + * @param out_size size in bytes of the out buffer, must be at + * least 3/4 of the length of in + * @return number of bytes written, or a negative value in case of + * invalid input */ int av_base64_decode(uint8_t *out, const char *in, int out_size); /** - * Encode in base64 the data in in and put the resulting string - * in out. + * Encode data to base64 and null-terminate. * - * @param out_size size in bytes of the out string, it should be at - * least ((in_size + 2) / 3) * 4 + 1 - * @param in_size size in bytes of the in buffer - * @return the string containing the encoded data, or NULL in case of - * error + * @param out buffer for encoded data + * @param out_size size in bytes of the output buffer, must be at + * least AV_BASE64_SIZE(in_size) + * @param in_size size in bytes of the 'in' buffer + * @return 'out' or NULL in case of error */ char *av_base64_encode(char *out, int out_size, const uint8_t *in, int in_size);

1 0

r23896 - trunk/libavutil/aes.c
by subversion＠mplayerhq.hu 30 Jun '10

30 Jun '10

Author: reimar Date: Wed Jun 30 06:50:35 2010 New Revision: 23896 Log: Chnage AES code to be strict-aliasing-safe. Makes it give correct results with e.g. gcc 4.4 For unknown reasons the generate asm code also changes on e.g. gcc 4.3, making the code a bit larger and a bit slower. Modified: trunk/libavutil/aes.c Modified: trunk/libavutil/aes.c ============================================================================== --- trunk/libavutil/aes.c Wed Jun 30 03:57:05 2010 (r23895) +++ trunk/libavutil/aes.c Wed Jun 30 06:50:35 2010 (r23896) @@ -23,11 +23,18 @@ #include "common.h" #include "aes.h" +typedef union { + uint64_t u64[2]; + uint32_t u32[4]; + uint8_t u8x4[4][4]; + uint8_t u8[16]; +} av_aes_block; + typedef struct AVAES{ // Note: round_key[16] is accessed in the init code, but this only // overwrites state, which does not matter (see also r7471). - uint8_t round_key[15][4][4]; - uint8_t state[2][4][4]; + av_aes_block round_key[15]; + av_aes_block state[2]; int rounds; }AVAES; @@ -47,18 +54,18 @@ static uint32_t enc_multbl[4][256]; static uint32_t dec_multbl[4][256]; #endif -static inline void addkey(uint64_t dst[2], const uint64_t src[2], const uint64_t round_key[2]){ - dst[0] = src[0] ^ round_key[0]; - dst[1] = src[1] ^ round_key[1]; +static inline void addkey(av_aes_block *dst, const av_aes_block *src, const av_aes_block *round_key){ + dst->u64[0] = src->u64[0] ^ round_key->u64[0]; + dst->u64[1] = src->u64[1] ^ round_key->u64[1]; } -static void subshift(uint8_t s0[2][16], int s, const uint8_t *box){ - uint8_t (*s1)[16]= s0[0] - s; - uint8_t (*s3)[16]= s0[0] + s; - s0[0][0]=box[s0[1][ 0]]; s0[0][ 4]=box[s0[1][ 4]]; s0[0][ 8]=box[s0[1][ 8]]; s0[0][12]=box[s0[1][12]]; - s1[0][3]=box[s1[1][ 7]]; s1[0][ 7]=box[s1[1][11]]; s1[0][11]=box[s1[1][15]]; s1[0][15]=box[s1[1][ 3]]; - s0[0][2]=box[s0[1][10]]; s0[0][10]=box[s0[1][ 2]]; s0[0][ 6]=box[s0[1][14]]; s0[0][14]=box[s0[1][ 6]]; - s3[0][1]=box[s3[1][13]]; s3[0][13]=box[s3[1][ 9]]; s3[0][ 9]=box[s3[1][ 5]]; s3[0][ 5]=box[s3[1][ 1]]; +static void subshift(av_aes_block s0[2], int s, const uint8_t *box){ + av_aes_block *s1= (av_aes_block *)(s0[0].u8 - s); + av_aes_block *s3= (av_aes_block *)(s0[0].u8 + s); + s0[0].u8[0]=box[s0[1].u8[ 0]]; s0[0].u8[ 4]=box[s0[1].u8[ 4]]; s0[0].u8[ 8]=box[s0[1].u8[ 8]]; s0[0].u8[12]=box[s0[1].u8[12]]; + s1[0].u8[3]=box[s1[1].u8[ 7]]; s1[0].u8[ 7]=box[s1[1].u8[11]]; s1[0].u8[11]=box[s1[1].u8[15]]; s1[0].u8[15]=box[s1[1].u8[ 3]]; + s0[0].u8[2]=box[s0[1].u8[10]]; s0[0].u8[10]=box[s0[1].u8[ 2]]; s0[0].u8[ 6]=box[s0[1].u8[14]]; s0[0].u8[14]=box[s0[1].u8[ 6]]; + s3[0].u8[1]=box[s3[1].u8[13]]; s3[0].u8[13]=box[s3[1].u8[ 9]]; s3[0].u8[ 9]=box[s3[1].u8[ 5]]; s3[0].u8[ 5]=box[s3[1].u8[ 1]]; } static inline int mix_core(uint32_t multbl[][256], int a, int b, int c, int d){ @@ -70,11 +77,11 @@ static inline int mix_core(uint32_t mult #endif } -static inline void mix(uint8_t state[2][4][4], uint32_t multbl[][256], int s1, int s3){ - ((uint32_t *)(state))[0] = mix_core(multbl, state[1][0][0], state[1][s1 ][1], state[1][2][2], state[1][s3 ][3]); - ((uint32_t *)(state))[1] = mix_core(multbl, state[1][1][0], state[1][s3-1][1], state[1][3][2], state[1][s1-1][3]); - ((uint32_t *)(state))[2] = mix_core(multbl, state[1][2][0], state[1][s3 ][1], state[1][0][2], state[1][s1 ][3]); - ((uint32_t *)(state))[3] = mix_core(multbl, state[1][3][0], state[1][s1-1][1], state[1][1][2], state[1][s3-1][3]); +static inline void mix(av_aes_block state[2], uint32_t multbl[][256], int s1, int s3){ + state[0].u32[0] = mix_core(multbl, state[1].u8x4[0][0], state[1].u8x4[s1 ][1], state[1].u8x4[2][2], state[1].u8x4[s3 ][3]); + state[0].u32[1] = mix_core(multbl, state[1].u8x4[1][0], state[1].u8x4[s3-1][1], state[1].u8x4[3][2], state[1].u8x4[s1-1][3]); + state[0].u32[2] = mix_core(multbl, state[1].u8x4[2][0], state[1].u8x4[s3 ][1], state[1].u8x4[0][2], state[1].u8x4[s1 ][3]); + state[0].u32[3] = mix_core(multbl, state[1].u8x4[3][0], state[1].u8x4[s1-1][1], state[1].u8x4[1][2], state[1].u8x4[s3-1][3]); } static inline void crypt(AVAES *a, int s, const uint8_t *sbox, uint32_t multbl[][256]){ @@ -82,29 +89,32 @@ static inline void crypt(AVAES *a, int s for(r=a->rounds-1; r>0; r--){ mix(a->state, multbl, 3-s, 1+s); - addkey(a->state[1], a->state[0], a->round_key[r]); + addkey(&a->state[1], &a->state[0], &a->round_key[r]); } - subshift(a->state[0][0], s, sbox); + subshift(&a->state[0], s, sbox); } -void av_aes_crypt(AVAES *a, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt){ +void av_aes_crypt(AVAES *a, uint8_t *dst_, const uint8_t *src_, int count, uint8_t *iv_, int decrypt){ + av_aes_block *dst = (av_aes_block *)dst_; + const av_aes_block *src = (const av_aes_block *)src_; + av_aes_block *iv = (av_aes_block *)iv_; while(count--){ - addkey(a->state[1], src, a->round_key[a->rounds]); + addkey(&a->state[1], src, &a->round_key[a->rounds]); if(decrypt) { crypt(a, 0, inv_sbox, dec_multbl); if(iv){ - addkey(a->state[0], a->state[0], iv); + addkey(&a->state[0], &a->state[0], iv); memcpy(iv, src, 16); } - addkey(dst, a->state[0], a->round_key[0]); + addkey(dst, &a->state[0], &a->round_key[0]); }else{ - if(iv) addkey(a->state[1], a->state[1], iv); + if(iv) addkey(&a->state[1], &a->state[1], iv); crypt(a, 2, sbox, enc_multbl); - addkey(dst, a->state[0], a->round_key[0]); + addkey(dst, &a->state[0], &a->round_key[0]); if(iv) memcpy(iv, dst, 16); } - src+=16; - dst+=16; + src++; + dst++; } } @@ -158,7 +168,7 @@ int av_aes_init(AVAES *a, const uint8_t memcpy(tk, key, KC*4); for(t= 0; t < (rounds+1)*16;) { - memcpy(a->round_key[0][0]+t, tk, KC*4); + memcpy(a->round_key[0].u8+t, tk, KC*4); t+= KC*4; for(i = 0; i < 4; i++) @@ -175,16 +185,16 @@ int av_aes_init(AVAES *a, const uint8_t if(decrypt){ for(i=1; i<rounds; i++){ - uint8_t tmp[3][16]; - memcpy(tmp[2], a->round_key[i][0], 16); + av_aes_block tmp[3]; + memcpy(&tmp[2], &a->round_key[i], 16); subshift(&tmp[1], 0, sbox); mix(tmp, dec_multbl, 1, 3); - memcpy(a->round_key[i][0], tmp[0], 16); + memcpy(&a->round_key[i], &tmp[0], 16); } }else{ for(i=0; i<(rounds+1)>>1; i++){ for(j=0; j<16; j++) - FFSWAP(int, a->round_key[i][0][j], a->round_key[rounds-i][0][j]); + FFSWAP(int, a->round_key[i].u8[j], a->round_key[rounds-i].u8[j]); } }

4 4