[FFmpeg-devel] [PATCH 2/3] fate: add test for async protocol

Michael Niedermayer michael at niedermayer.cc
Tue Jul 21 11:22:14 CEST 2015


On Tue, Jul 21, 2015 at 03:46:03PM +0800, Zhang Rui wrote:
> ---
>  libavformat/Makefile       |   3 +-
>  libavformat/async.c        | 169 +++++++++++++++++++++++++++++++++++++++++++++
>  tests/fate/libavformat.mak |   4 ++
>  tests/ref/fate/async       |   7 ++
>  4 files changed, 182 insertions(+), 1 deletion(-)
>  create mode 100644 tests/ref/fate/async
> 
> diff --git a/libavformat/Makefile b/libavformat/Makefile
> index 108b6a6..cc73fd8 100644
> --- a/libavformat/Makefile
> +++ b/libavformat/Makefile
> @@ -546,7 +546,8 @@ SLIBOBJS-$(HAVE_GNU_WINDRES)             += avformatres.o
>  SKIPHEADERS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh.h
>  SKIPHEADERS-$(CONFIG_NETWORK)            += network.h rtsp.h
>  
> -TESTPROGS = seek                                                        \
> +TESTPROGS = async                                                       \
> +            seek                                                        \
>              srtp                                                        \
>              url                                                         \
>  
> diff --git a/libavformat/async.c b/libavformat/async.c
> index 0748309..1ab28d3 100644
> --- a/libavformat/async.c
> +++ b/libavformat/async.c
> @@ -385,3 +385,172 @@ URLProtocol ff_async_protocol = {
>      .priv_data_size      = sizeof(Context),
>      .priv_data_class     = &async_context_class,
>  };
> +
> +#ifdef TEST
> +
> +#define TEST_SEEK_POS    (1536)
> +#define TEST_STREAM_SIZE (2048)
> +
> +typedef struct TestContext {
> +    AVClass        *class;
> +    size_t          logical_pos;
> +    size_t          logical_size;
> +} TestContext;
> +
> +static int async_test_open(URLContext *h, const char *arg, int flags, AVDictionary **options)
> +{
> +    TestContext *c = h->priv_data;
> +    c->logical_pos  = 0;
> +    c->logical_size = TEST_STREAM_SIZE;
> +    return 0;
> +}
> +
> +static int async_test_close(URLContext *h)
> +{
> +    return 0;
> +}
> +
> +static int async_test_read(URLContext *h, unsigned char *buf, int size)
> +{
> +    TestContext *c = h->priv_data;
> +    int          read_len = 0;
> +
> +    if (c->logical_pos >= c->logical_size)
> +        return AVERROR_EOF;
> +

> +    for (int i = 0; i < size; ++i) {

some compilers have problems with the for(int ... syntax



> +        buf[i] = c->logical_pos & 0xFF;
> +
> +        c->logical_pos++;
> +        read_len++;
> +
> +        if (c->logical_pos >= c->logical_size)
> +            break;
> +    }
> +
> +    return read_len;
> +}
> +
> +static int64_t async_test_seek(URLContext *h, int64_t pos, int whence)
> +{
> +    TestContext *c = h->priv_data;
> +    int64_t      new_logical_pos;
> +
> +    if (whence == AVSEEK_SIZE) {
> +        return c->logical_size;

> +    } if (whence == SEEK_CUR) {

else if


> +        new_logical_pos = pos + c->logical_pos;
> +    } else if (whence == SEEK_SET){
> +        new_logical_pos = pos;
> +    } else {
> +        return AVERROR(EINVAL);
> +    }
> +    if (new_logical_pos < 0)
> +        return AVERROR(EINVAL);
> +
> +    c->logical_pos = new_logical_pos;
> +    return new_logical_pos;
> +}
> +
> +static const AVClass async_test_context_class = {
> +    .class_name = "Async-Test",
> +    .item_name  = av_default_item_name,
> +    .version    = LIBAVUTIL_VERSION_INT,
> +};
> +
> +URLProtocol ff_async_test_protocol = {
> +    .name                = "async-test",
> +    .url_open2           = async_test_open,
> +    .url_read            = async_test_read,
> +    .url_seek            = async_test_seek,
> +    .url_close           = async_test_close,
> +    .priv_data_size      = sizeof(TestContext),
> +    .priv_data_class     = &async_test_context_class,
> +};
> +
> +int main(void)
> +{
> +    URLContext   *h = NULL;
> +    int           ret;
> +    int64_t       size;
> +    int64_t       pos;
> +    int64_t       read_len;
> +    unsigned char buf[4096];
> +
> +    ffurl_register_protocol(&ff_async_protocol);
> +    ffurl_register_protocol(&ff_async_test_protocol);
> +
> +    ret = ffurl_open(&h, "async:async-test:", AVIO_FLAG_READ, NULL, NULL);
> +    printf("open: %d\n", ret);
> +
> +    size = ffurl_size(h);
> +    printf("size: %"PRId64"\n", size);
> +
> +    pos = ffurl_seek(h, 0, SEEK_CUR);
> +    read_len = 0;
> +    while (1) {
> +        ret = ffurl_read(h, buf, sizeof(buf));
> +        if (ret == AVERROR_EOF) {
> +            printf("read-error: AVERROR_EOF at %"PRId64"\n", ffurl_seek(h, 0, SEEK_CUR));
> +            break;
> +        }
> +        else if (ret == 0)
> +            break;
> +        else if (ret < 0) {
> +            printf("read-error: %d at %"PRId64"\n", ret, ffurl_seek(h, 0, SEEK_CUR));
> +            goto fail;
> +        } else {
> +            for (int i = 0; i < ret; ++i) {
> +                if (buf[i] != (pos & 0xFF)) {
> +                    printf("read-mismatch: actual %d, expecting %d, at %"PRId64"\n",
> +                           (int)buf[i], (int)(pos & 0xFF), pos);
> +                    break;
> +                }
> +                pos++;
> +            }
> +        }
> +
> +        read_len += ret;
> +    }
> +    printf("read: %"PRId64"\n", read_len);
> +
> +    ret = ffurl_read(h, buf, 1);
> +    printf("read: %d\n", ret);
> +
> +    pos = ffurl_seek(h, TEST_SEEK_POS, SEEK_SET);
> +    printf("seek: %"PRId64"\n", pos);
> +
> +    read_len = 0;
> +    while (1) {
> +        ret = ffurl_read(h, buf, sizeof(buf));
> +        if (ret == AVERROR_EOF)
> +            break;
> +        else if (ret == 0)
> +            break;
> +        else if (ret < 0) {
> +            printf("read-error: %d at %"PRId64"\n", ret, ffurl_seek(h, 0, SEEK_CUR));
> +            goto fail;
> +        } else {
> +            for (int i = 0; i < ret; ++i) {
> +                if (buf[i] != (pos & 0xFF)) {
> +                    printf("read-mismatch: actual %d, expecting %d, at %"PRId64"\n",
> +                           (int)buf[i], (int)(pos & 0xFF), pos);
> +                    break;
> +                }
> +                pos++;
> +            }
> +        }
> +
> +        read_len += ret;
> +    }
> +    printf("read: %"PRId64"\n", read_len);
> +
> +    ret = ffurl_read(h, buf, 1);
> +    printf("read: %d\n", ret);
> +
> +fail:
> +    ffurl_close(h);
> +    return 0;
> +}
> +
> +#endif
> diff --git a/tests/fate/libavformat.mak b/tests/fate/libavformat.mak
> index a9c02bc..5a745ac 100644
> --- a/tests/fate/libavformat.mak
> +++ b/tests/fate/libavformat.mak
> @@ -1,3 +1,7 @@
> +FATE_LIBAVFORMAT-yes += fate-async
> +fate-async: libavformat/async-test$(EXESUF)
> +fate-async: CMD = run libavformat/async-test

this breaks
make fate
with --disable-pthreads on mips

/usr/lib/gcc/mips-linux-gnu/4.4.5/../../../../mips-linux-gnu/bin/ld: libavformat/async-test.o: undefined reference to symbol 'pthread_create@@GLIBC_2.2'
/usr/lib/gcc/mips-linux-gnu/4.4.5/../../../../mips-linux-gnu/bin/ld: note: 'pthread_create@@GLIBC_2.2' is defined in DSO /usr/mips-linux-gnu/lib/libpthread.so.0 so try adding it to the linker command line
/usr/mips-linux-gnu/lib/libpthread.so.0: could not read symbols: Invalid operation


[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

What does censorship reveal? It reveals fear. -- Julian Assange
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20150721/29c21172/attachment.sig>


More information about the ffmpeg-devel mailing list