avformat/imf: cosmetics
s/++i/i++/g
Signed-off-by: Zane van Iperen <zane@zanevaniperen.com>
(cherry picked from commit 40766ae1da
)
This commit is contained in:
@@ -261,7 +261,7 @@ static void imf_asset_locator_map_init(IMFAssetLocatorMap *asset_map)
|
|||||||
*/
|
*/
|
||||||
static void imf_asset_locator_map_deinit(IMFAssetLocatorMap *asset_map)
|
static void imf_asset_locator_map_deinit(IMFAssetLocatorMap *asset_map)
|
||||||
{
|
{
|
||||||
for (uint32_t i = 0; i < asset_map->asset_count; ++i)
|
for (uint32_t i = 0; i < asset_map->asset_count; i++)
|
||||||
av_freep(&asset_map->assets[i].absolute_uri);
|
av_freep(&asset_map->assets[i].absolute_uri);
|
||||||
|
|
||||||
av_freep(&asset_map->assets);
|
av_freep(&asset_map->assets);
|
||||||
@@ -327,7 +327,7 @@ clean_up:
|
|||||||
|
|
||||||
static IMFAssetLocator *find_asset_map_locator(IMFAssetLocatorMap *asset_map, FFIMFUUID uuid)
|
static IMFAssetLocator *find_asset_map_locator(IMFAssetLocatorMap *asset_map, FFIMFUUID uuid)
|
||||||
{
|
{
|
||||||
for (uint32_t i = 0; i < asset_map->asset_count; ++i) {
|
for (uint32_t i = 0; i < asset_map->asset_count; i++) {
|
||||||
if (memcmp(asset_map->assets[i].uuid, uuid, 16) == 0)
|
if (memcmp(asset_map->assets[i].uuid, uuid, 16) == 0)
|
||||||
return &(asset_map->assets[i]);
|
return &(asset_map->assets[i]);
|
||||||
}
|
}
|
||||||
@@ -464,7 +464,7 @@ static int open_track_file_resource(AVFormatContext *s,
|
|||||||
return AVERROR(ENOMEM);
|
return AVERROR(ENOMEM);
|
||||||
track->resources = tmp;
|
track->resources = tmp;
|
||||||
|
|
||||||
for (uint32_t i = 0; i < track_file_resource->base.repeat_count; ++i) {
|
for (uint32_t i = 0; i < track_file_resource->base.repeat_count; i++) {
|
||||||
IMFVirtualTrackResourcePlaybackCtx vt_ctx;
|
IMFVirtualTrackResourcePlaybackCtx vt_ctx;
|
||||||
|
|
||||||
vt_ctx.locator = asset_locator;
|
vt_ctx.locator = asset_locator;
|
||||||
@@ -484,7 +484,7 @@ static int open_track_file_resource(AVFormatContext *s,
|
|||||||
|
|
||||||
static void imf_virtual_track_playback_context_deinit(IMFVirtualTrackPlaybackCtx *track)
|
static void imf_virtual_track_playback_context_deinit(IMFVirtualTrackPlaybackCtx *track)
|
||||||
{
|
{
|
||||||
for (uint32_t i = 0; i < track->resource_count; ++i)
|
for (uint32_t i = 0; i < track->resource_count; i++)
|
||||||
avformat_close_input(&track->resources[i].ctx);
|
avformat_close_input(&track->resources[i].ctx);
|
||||||
|
|
||||||
av_freep(&track->resources);
|
av_freep(&track->resources);
|
||||||
@@ -546,7 +546,7 @@ static int set_context_streams_from_tracks(AVFormatContext *s)
|
|||||||
IMFContext *c = s->priv_data;
|
IMFContext *c = s->priv_data;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
for (uint32_t i = 0; i < c->track_count; ++i) {
|
for (uint32_t i = 0; i < c->track_count; i++) {
|
||||||
AVStream *asset_stream;
|
AVStream *asset_stream;
|
||||||
AVStream *first_resource_stream;
|
AVStream *first_resource_stream;
|
||||||
|
|
||||||
@@ -593,7 +593,7 @@ static int open_cpl_tracks(AVFormatContext *s)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (uint32_t i = 0; i < c->cpl->main_audio_track_count; ++i) {
|
for (uint32_t i = 0; i < c->cpl->main_audio_track_count; i++) {
|
||||||
if ((ret = open_virtual_track(s, &c->cpl->main_audio_tracks[i], track_index++)) != 0) {
|
if ((ret = open_virtual_track(s, &c->cpl->main_audio_tracks[i], track_index++)) != 0) {
|
||||||
av_log(s,
|
av_log(s,
|
||||||
AV_LOG_ERROR,
|
AV_LOG_ERROR,
|
||||||
@@ -711,7 +711,7 @@ static IMFVirtualTrackResourcePlaybackCtx *get_resource_context_for_timestamp(AV
|
|||||||
track->index,
|
track->index,
|
||||||
av_q2d(track->current_timestamp),
|
av_q2d(track->current_timestamp),
|
||||||
av_q2d(track->duration));
|
av_q2d(track->duration));
|
||||||
for (uint32_t i = 0; i < track->resource_count; ++i) {
|
for (uint32_t i = 0; i < track->resource_count; i++) {
|
||||||
cumulated_duration = av_add_q(cumulated_duration,
|
cumulated_duration = av_add_q(cumulated_duration,
|
||||||
av_make_q((int)track->resources[i].resource->base.duration
|
av_make_q((int)track->resources[i].resource->base.duration
|
||||||
* edit_unit_duration.num,
|
* edit_unit_duration.num,
|
||||||
@@ -836,7 +836,7 @@ static int imf_close(AVFormatContext *s)
|
|||||||
imf_asset_locator_map_deinit(&c->asset_locator_map);
|
imf_asset_locator_map_deinit(&c->asset_locator_map);
|
||||||
ff_imf_cpl_free(c->cpl);
|
ff_imf_cpl_free(c->cpl);
|
||||||
|
|
||||||
for (uint32_t i = 0; i < c->track_count; ++i) {
|
for (uint32_t i = 0; i < c->track_count; i++) {
|
||||||
imf_virtual_track_playback_context_deinit(c->tracks[i]);
|
imf_virtual_track_playback_context_deinit(c->tracks[i]);
|
||||||
av_freep(&c->tracks[i]);
|
av_freep(&c->tracks[i]);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user