comparison movenc.c @ 2920:5f15ed0f5fdc libavformat

Add one more parameter to avc_parse_nal_units so that it allows not to free the input buffer. This is required by upcoming extraction of isom_write_avcc to a function.

2919:e70dc14a3f9f

    }

    return end + 3;
}

static int avc_parse_nal_units(uint8_t **buf, int *size)
{
    ByteIOContext *pb;
    uint8_t *p = *buf;
    uint8_t *end = p + *size;
    uint8_t *nal_start, *nal_end;
    int ret = url_open_dyn_buf(&pb);
    if(ret < 0)
        return ret;

        if (AV_RB32(track->vosData) == 0x00000001) {
            uint8_t *buf, *end;
            uint32_t sps_size=0, pps_size=0;
            uint8_t *sps=0, *pps=0;

            int ret = avc_parse_nal_units(&track->vosData, &track->vosLen);
            if (ret < 0)
                return ret;
            buf = track->vosData;
            end = track->vosData + track->vosLen;

    }

    if (enc->codec_id == CODEC_ID_H264 && trk->vosLen > 0 && *(uint8_t *)trk->vosData != 1) {
        /* from x264 or from bytestream h264 */
        /* nal reformating needed */
        int ret = avc_parse_nal_units(&pkt->data, &pkt->size);
        if (ret < 0)
            return ret;
        assert(pkt->size);
        size = pkt->size;
    } else if (enc->codec_id == CODEC_ID_DNXHD && !trk->vosLen) {

2920:5f15ed0f5fdc

    }

    return end + 3;
}

static int avc_parse_nal_units(uint8_t *buf_in, uint8_t **buf, int *size)
{
    ByteIOContext *pb;
    uint8_t *p = buf_in;
    uint8_t *end = p + *size;
    uint8_t *nal_start, *nal_end;
    int ret = url_open_dyn_buf(&pb);
    if(ret < 0)
        return ret;

        if (AV_RB32(track->vosData) == 0x00000001) {
            uint8_t *buf, *end;
            uint32_t sps_size=0, pps_size=0;
            uint8_t *sps=0, *pps=0;

            int ret = avc_parse_nal_units(track->vosData, &track->vosData, &track->vosLen);
            if (ret < 0)
                return ret;
            buf = track->vosData;
            end = track->vosData + track->vosLen;

    }

    if (enc->codec_id == CODEC_ID_H264 && trk->vosLen > 0 && *(uint8_t *)trk->vosData != 1) {
        /* from x264 or from bytestream h264 */
        /* nal reformating needed */
        int ret = avc_parse_nal_units(pkt->data, &pkt->data, &pkt->size);
        if (ret < 0)
            return ret;
        assert(pkt->size);
        size = pkt->size;
    } else if (enc->codec_id == CODEC_ID_DNXHD && !trk->vosLen) {