/*
* Copyright (c) 2006 Ryan Martell. (rdm4@martellventures.com)
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav 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,
+ * Libav 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
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
- * @file libavutil/base64.c
+ * @file
* @brief Base64 encode/decode
* @author Ryan Martell <rdm4@martellventures.com> (with lots of Michael)
*/
0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33
};
-int av_base64_decode(uint8_t * out, const char *in, int out_size)
+int av_base64_decode(uint8_t *out, const char *in, int out_size)
{
int i, v;
uint8_t *dst = out;
* Fixed edge cases and made it work from data (vs. strings) by Ryan.
*****************************************************************************/
-char *av_base64_encode(char * buf, int buf_size, const uint8_t * src, int size)
+char *av_base64_encode(char *out, int out_size, const uint8_t *in, int in_size)
{
static const char b64[] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
char *ret, *dst;
unsigned i_bits = 0;
int i_shift = 0;
- int bytes_remaining = size;
+ int bytes_remaining = in_size;
- if (size >= UINT_MAX / 4 ||
- buf_size < (size+2) / 3 * 4 + 1)
+ if (in_size >= UINT_MAX / 4 ||
+ out_size < AV_BASE64_SIZE(in_size))
return NULL;
- ret = dst = buf;
+ ret = dst = out;
while (bytes_remaining) {
- i_bits = (i_bits << 8) + *src++;
+ i_bits = (i_bits << 8) + *in++;
bytes_remaining--;
i_shift += 8;
#define MAX_DATA_SIZE 1024
#define MAX_ENCODED_SIZE 2048
-int test_encode_decode(const uint8_t *data, unsigned int data_size, const char *encoded_ref)
+static int test_encode_decode(const uint8_t *data, unsigned int data_size,
+ const char *encoded_ref)
{
char encoded[MAX_ENCODED_SIZE];
uint8_t data2[MAX_DATA_SIZE];