diff options
author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-06-25 02:25:44 +0200 |
---|---|---|
committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-06-25 02:25:44 +0200 |
commit | ad56f2c46ac6deec86870ec10f2a11a644df07d4 (patch) | |
tree | 89f2d90c5586560911e67c872b530c77f151168d /stream/stream_memory.c | |
parent | 0536841647ef7931bffb4386d8ffbb5b2b568e8a (diff) | |
parent | 393bb2a565dc1e27812e1dd20747814892f80da2 (diff) | |
download | mpv-ad56f2c46ac6deec86870ec10f2a11a644df07d4.tar.bz2 mpv-ad56f2c46ac6deec86870ec10f2a11a644df07d4.tar.xz |
Merge branch 'master' into release/current
Diffstat (limited to 'stream/stream_memory.c')
-rw-r--r-- | stream/stream_memory.c | 37 |
1 files changed, 35 insertions, 2 deletions
diff --git a/stream/stream_memory.c b/stream/stream_memory.c index 4bcb860c49..84947b5aeb 100644 --- a/stream/stream_memory.c +++ b/stream/stream_memory.c @@ -55,6 +55,32 @@ static int control(stream_t *s, int cmd, void *arg) return STREAM_UNSUPPORTED; } +static int h_to_i(unsigned char c) +{ + if (c >= '0' && c <= '9') + return c - '0'; + if (c >= 'a' && c <= 'f') + return c - 'a' + 10; + if (c >= 'A' && c <= 'F') + return c - 'A' + 10; + return -1; +} + +static bool bstr_to_hex_inplace(bstr *h) +{ + if (h->len % 2) + return false; + for (int n = 0; n < h->len / 2; n++) { + int hi = h_to_i(h->start[n * 2 + 0]); + int lo = h_to_i(h->start[n * 2 + 1]); + if (hi < 0 || lo < 0) + return false; + h->start[n] = (hi << 4) | lo; + } + h->len /= 2; + return true; +} + static int open_f(stream_t *stream) { stream->fill_buffer = fill_buffer; @@ -68,14 +94,21 @@ static int open_f(stream_t *stream) // Initial data bstr data = bstr0(stream->url); - bstr_eatstart0(&data, "memory://"); + bool use_hex = bstr_eatstart0(&data, "hex://"); + if (!use_hex) + bstr_eatstart0(&data, "memory://"); stream_control(stream, STREAM_CTRL_SET_CONTENTS, &data); + if (use_hex && !bstr_to_hex_inplace(&p->data)) { + MP_FATAL(stream, "Invalid data.\n"); + return STREAM_ERROR; + } + return STREAM_OK; } const stream_info_t stream_info_memory = { .name = "memory", .open = open_f, - .protocols = (const char*const[]){ "memory", NULL }, + .protocols = (const char*const[]){ "memory", "hex", NULL }, }; |