Skip to content

Commit c6b6340

Browse files
farindkfarindk
committed
rename heif_track_builder to heif_track_options
1 parent ac6da2a commit c6b6340

File tree

12 files changed

+76
-76
lines changed

12 files changed

+76
-76
lines changed

‎examples/heif_enc.cc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1694,8 +1694,8 @@ int encode_vmt_metadata_track(heif_context* context, heif_track* visual_track)
16941694

16951695
heif_track* track = nullptr;
16961696

1697-
heif_track_builder* track_builder = heif_track_builder_alloc();
1698-
heif_track_builder_set_timescale(track_builder, 1000);
1697+
heif_track_options* track_builder = heif_track_options_alloc();
1698+
heif_track_options_set_timescale(track_builder, 1000);
16991699

17001700
heif_context_add_uri_metadata_sequence_track(context, track_builder, "vmt:metadata",&track);
17011701
heif_raw_sequence_sample* sample = heif_raw_sequence_sample_alloc();
@@ -1760,7 +1760,7 @@ int encode_vmt_metadata_track(heif_context* context, heif_track* visual_track)
17601760
// --- release all objects
17611761

17621762
heif_raw_sequence_sample_release(sample);
1763-
heif_track_builder_release(track_builder);
1763+
heif_track_options_release(track_builder);
17641764
heif_track_release(track);
17651765

17661766
return 0;
@@ -1800,9 +1800,9 @@ int do_encode_sequence(heif_context* context, heif_encoder* encoder, heif_encodi
18001800
}
18011801

18021802
if (first_image) {
1803-
heif_track_builder* track_builder = heif_track_builder_alloc();
1803+
heif_track_options* track_builder = heif_track_options_alloc();
18041804

1805-
heif_track_builder_set_timescale(track_builder, sequence_timebase);
1805+
heif_track_options_set_timescale(track_builder, sequence_timebase);
18061806

18071807
heif_context_set_sequence_timescale(context, sequence_timebase);
18081808

@@ -1817,7 +1817,7 @@ int do_encode_sequence(heif_context* context, heif_encoder* encoder, heif_encodi
18171817
nullptr,
18181818
&track);
18191819

1820-
heif_track_builder_release(track_builder);
1820+
heif_track_options_release(track_builder);
18211821

18221822
first_image = false;
18231823
}

‎examples/heif_info.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,7 @@ int main(int argc, char** argv)
764764
uint64_t duration = heif_context_get_sequence_duration(context);
765765
std::cout << "sequence duration: " << ((double)duration)/(double)timescale << " seconds\n";
766766

767-
// TrackInfo
767+
// TrackOptions
768768

769769
std::vector<uint32_t> track_ids(nTracks);
770770

‎libheif/api/libheif/heif_sequences.cc

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -285,41 +285,41 @@ void heif_context_set_sequence_timescale(heif_context* ctx, uint32_t timescale)
285285
}
286286

287287

288-
struct heif_track_builder {
289-
TrackInfo info;
288+
struct heif_track_options {
289+
TrackOptions options;
290290
};
291291

292292

293-
heif_track_builder* heif_track_builder_alloc()
293+
heif_track_options* heif_track_options_alloc()
294294
{
295-
return new heif_track_builder;
295+
return new heif_track_options;
296296
}
297297

298298

299-
void heif_track_builder_release(struct heif_track_builder* builder)
299+
void heif_track_options_release(struct heif_track_options* options)
300300
{
301-
delete builder;
301+
delete options;
302302
}
303303

304304

305-
void heif_track_builder_set_timescale(struct heif_track_builder* builder, uint32_t timescale)
305+
void heif_track_options_set_timescale(struct heif_track_options* options, uint32_t timescale)
306306
{
307-
builder->info.track_timescale = timescale;
307+
options->options.track_timescale = timescale;
308308
}
309309

310310

311-
void heif_track_builder_set_interleaved_aux_info(struct heif_track_builder* builder, int interleaved_flag)
311+
void heif_track_options_set_interleaved_aux_info(struct heif_track_options* options, int interleaved_flag)
312312
{
313-
builder->info.write_aux_info_interleaved = (interleaved_flag != 0);
313+
options->options.write_aux_info_interleaved = (interleaved_flag != 0);
314314
}
315315

316316

317-
struct heif_error heif_track_builder_enable_tai_timestamps(struct heif_track_builder* builder,
317+
struct heif_error heif_track_options_enable_tai_timestamps(struct heif_track_options* options,
318318
struct heif_tai_clock_info* tai_info,
319319
enum heif_sample_aux_info_presence presence)
320320
{
321-
builder->info.with_tai_timestamps = presence;
322-
builder->info.tai_clock_info = tai_info;
321+
options->options.with_tai_timestamps = presence;
322+
options->options.tai_clock_info = tai_info;
323323

324324
if (presence != heif_sample_aux_info_presence_none &&
325325
tai_info == nullptr) {
@@ -332,27 +332,27 @@ struct heif_error heif_track_builder_enable_tai_timestamps(struct heif_track_bui
332332
}
333333

334334

335-
void heif_track_builder_enable_gimi_content_ids(struct heif_track_builder* builder,
335+
void heif_track_options_enable_gimi_content_ids(struct heif_track_options* builder,
336336
enum heif_sample_aux_info_presence presence)
337337
{
338-
builder->info.with_sample_content_ids = presence;
338+
builder->options.with_sample_content_ids = presence;
339339
}
340340

341341

342-
void heif_track_builder_set_gimi_track_id(struct heif_track_builder* builder,
342+
void heif_track_options_set_gimi_track_id(struct heif_track_options* builder,
343343
const char* track_id)
344344
{
345345
if (track_id == nullptr) {
346-
builder->info.gimi_track_content_id.clear();
346+
builder->options.gimi_track_content_id.clear();
347347
return;
348348
}
349349

350-
builder->info.gimi_track_content_id = track_id;
350+
builder->options.gimi_track_content_id = track_id;
351351
}
352352

353353

354354
struct heif_error heif_context_add_visual_sequence_track(heif_context* ctx,
355-
struct heif_track_builder* builder,
355+
struct heif_track_options* track_options,
356356
uint16_t width, uint16_t height,
357357
heif_track_type track_type,
358358
const struct heif_encoding_options* options,
@@ -366,10 +366,10 @@ struct heif_error heif_context_add_visual_sequence_track(heif_context* ctx,
366366
"visual track has to be of type video or image sequence"};
367367
}
368368

369-
TrackInfo default_track_info;
370-
TrackInfo* track_info = &default_track_info;
371-
if (builder != nullptr) {
372-
track_info = &builder->info;
369+
TrackOptions default_track_info;
370+
TrackOptions* track_info = &default_track_info;
371+
if (track_options != nullptr) {
372+
track_info = &track_options->options;
373373
}
374374

375375
Result<std::shared_ptr<Track_Visual>> addResult = ctx->context->add_visual_sequence_track(track_info, track_type, width,height);
@@ -443,14 +443,14 @@ struct heif_error heif_track_encode_sequence_image(struct heif_track* track,
443443

444444

445445
struct heif_error heif_context_add_uri_metadata_sequence_track(heif_context* ctx,
446-
struct heif_track_builder* builder,
446+
struct heif_track_options* track_options,
447447
const char* uri,
448448
heif_track** out_track)
449449
{
450-
struct TrackInfo default_track_info;
451-
struct TrackInfo* track_info = &default_track_info;
452-
if (builder != nullptr) {
453-
track_info = &builder->info;
450+
struct TrackOptions default_track_info;
451+
struct TrackOptions* track_info = &default_track_info;
452+
if (track_options != nullptr) {
453+
track_info = &track_options->options;
454454
}
455455

456456
Result<std::shared_ptr<Track_Metadata>> addResult = ctx->context->add_uri_metadata_sequence_track(track_info, uri);

‎libheif/api/libheif/heif_sequences.h

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -261,22 +261,22 @@ enum heif_sample_aux_info_presence {
261261

262262

263263
/**
264-
* Allocate track builder object that is required to set parameters for a new track.
265-
* When you create a new track, you can also pass a NULL track_builder, in which case the default parameters are used.
264+
* Allocate track options object that is required to set options for a new track.
265+
* When you create a new track, you can also pass a NULL heif_track_options pointer, in which case the default options are used.
266266
*/
267267
LIBHEIF_API
268-
struct heif_track_builder* heif_track_builder_alloc();
268+
struct heif_track_options* heif_track_options_alloc();
269269

270270
LIBHEIF_API
271-
void heif_track_builder_release(struct heif_track_builder*);
271+
void heif_track_options_release(struct heif_track_options*);
272272

273273
/**
274274
* Set the track specific timescale. This is the number of clock ticks per second.
275275
* The default is 90,000 Hz.
276276
* @param timescale
277277
*/
278278
LIBHEIF_API
279-
void heif_track_builder_set_timescale(struct heif_track_builder*, uint32_t timescale);
279+
void heif_track_options_set_timescale(struct heif_track_options*, uint32_t timescale);
280280

281281
/**
282282
* Set whether the aux-info data should be stored interleaved with the sequence samples.
@@ -289,23 +289,23 @@ void heif_track_builder_set_timescale(struct heif_track_builder*, uint32_t times
289289
* This has the advantage that no aux_info offsets have to be written.
290290
*/
291291
LIBHEIF_API
292-
void heif_track_builder_set_interleaved_aux_info(struct heif_track_builder*, int interleaved_flag);
292+
void heif_track_options_set_interleaved_aux_info(struct heif_track_options*, int interleaved_flag);
293293

294294
LIBHEIF_API
295-
struct heif_error heif_track_builder_enable_tai_timestamps(struct heif_track_builder*,
295+
struct heif_error heif_track_options_enable_tai_timestamps(struct heif_track_options*,
296296
struct heif_tai_clock_info*,
297297
enum heif_sample_aux_info_presence);
298298

299299
LIBHEIF_API
300-
void heif_track_builder_enable_gimi_content_ids(struct heif_track_builder*,
300+
void heif_track_options_enable_gimi_content_ids(struct heif_track_options*,
301301
enum heif_sample_aux_info_presence);
302302

303303
/**
304304
* Set the GIMI format track ID string. If NULL is passed, no track ID is saved.
305305
* @param track_id
306306
*/
307307
LIBHEIF_API
308-
void heif_track_builder_set_gimi_track_id(struct heif_track_builder*,
308+
void heif_track_options_set_gimi_track_id(struct heif_track_options*,
309309
const char* track_id);
310310

311311

@@ -318,7 +318,7 @@ struct heif_sequence_encoding_options;
318318
* Add a visual track to the sequence.
319319
* The track ID is assigned automatically.
320320
*
321-
* @param builder Optional track builder with more track creation options. If NULL, default options will be used.
321+
* @param options Optional track creation options. If NULL, default options will be used.
322322
* @param width Image resolution width
323323
* @param height Image resolution height
324324
* @param track_type Has to be heif_track_type_video or heif_track_type_image_sequence
@@ -329,11 +329,11 @@ struct heif_sequence_encoding_options;
329329
*/
330330
LIBHEIF_API
331331
struct heif_error heif_context_add_visual_sequence_track(heif_context*,
332-
struct heif_track_builder* builder,
332+
struct heif_track_options* track_options,
333333
uint16_t width, uint16_t height,
334334
heif_track_type track_type,
335-
const struct heif_encoding_options* options,
336-
const struct heif_sequence_encoding_options* seq_options,
335+
const struct heif_encoding_options* encoding_options,
336+
const struct heif_sequence_encoding_options* seq_encoding_options,
337337
heif_track** out_track);
338338

339339
/**
@@ -362,11 +362,11 @@ struct heif_error heif_track_encode_sequence_image(struct heif_track*,
362362
* The track content type is specified by the 'uri' parameter.
363363
* This will be created as a 'urim' "URI Meta Sample Entry".
364364
*
365-
* @param builder Optional track builder with more track creation options. If NULL, default options will be used.
365+
* @param options Optional track creation options. If NULL, default options will be used.
366366
*/
367367
LIBHEIF_API
368368
struct heif_error heif_context_add_uri_metadata_sequence_track(heif_context*,
369-
struct heif_track_builder* builder,
369+
struct heif_track_options* options,
370370
const char* uri,
371371
heif_track** out_track);
372372

‎libheif/context.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1827,25 +1827,25 @@ uint64_t HeifContext::get_sequence_duration() const
18271827
}
18281828

18291829

1830-
Result<std::shared_ptr<Track_Visual>> HeifContext::add_visual_sequence_track(TrackInfo* info,
1830+
Result<std::shared_ptr<Track_Visual>> HeifContext::add_visual_sequence_track(TrackOptions* options,
18311831
uint32_t handler_type,
18321832
uint16_t width, uint16_t height)
18331833
{
18341834
m_heif_file->init_for_sequence();
18351835

1836-
std::shared_ptr<Track_Visual> trak = std::make_shared<Track_Visual>(this, 0, width, height, info, handler_type);
1836+
std::shared_ptr<Track_Visual> trak = std::make_shared<Track_Visual>(this, 0, width, height, options, handler_type);
18371837
m_tracks.insert({trak->get_id(), trak});
18381838

18391839
return trak;
18401840
}
18411841

18421842

1843-
Result<std::shared_ptr<class Track_Metadata>> HeifContext::add_uri_metadata_sequence_track(TrackInfo* info,
1843+
Result<std::shared_ptr<class Track_Metadata>> HeifContext::add_uri_metadata_sequence_track(TrackOptions* options,
18441844
std::string uri)
18451845
{
18461846
m_heif_file->init_for_sequence();
18471847

1848-
std::shared_ptr<Track_Metadata> trak = std::make_shared<Track_Metadata>(this, 0, uri, info);
1848+
std::shared_ptr<Track_Metadata> trak = std::make_shared<Track_Metadata>(this, 0, uri, options);
18491849
m_tracks.insert({trak->get_id(), trak});
18501850

18511851
return trak;

‎libheif/context.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,10 @@ class HeifContext : public ErrorBuffer
197197

198198
void set_sequence_timescale(uint32_t timescale);
199199

200-
Result<std::shared_ptr<class Track_Visual>> add_visual_sequence_track(struct TrackInfo*, uint32_t handler_type,
200+
Result<std::shared_ptr<class Track_Visual>> add_visual_sequence_track(struct TrackOptions*, uint32_t handler_type,
201201
uint16_t width, uint16_t height);
202202

203-
Result<std::shared_ptr<class Track_Metadata>> add_uri_metadata_sequence_track(struct TrackInfo*, std::string uri);
203+
Result<std::shared_ptr<class Track_Metadata>> add_uri_metadata_sequence_track(struct TrackOptions*, std::string uri);
204204

205205
private:
206206
std::map<heif_item_id, std::shared_ptr<ImageItem>> m_all_images;

‎libheif/sequences/track.cc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <limits>
3030

3131

32-
TrackInfo& TrackInfo::operator=(const TrackInfo& src)
32+
TrackOptions& TrackOptions::operator=(const TrackOptions& src)
3333
{
3434
if (&src == this) {
3535
return *this;
@@ -329,7 +329,7 @@ Track::Track(HeifContext* ctx, const std::shared_ptr<Box_trak>& trak_box)
329329
}
330330

331331

332-
Track::Track(HeifContext* ctx, uint32_t track_id, TrackInfo* info, uint32_t handler_type)
332+
Track::Track(HeifContext* ctx, uint32_t track_id, TrackOptions* options, uint32_t handler_type)
333333
{
334334
m_heif_context = ctx;
335335

@@ -366,7 +366,7 @@ Track::Track(HeifContext* ctx, uint32_t track_id, TrackInfo* info, uint32_t hand
366366
m_trak->append_child_box(mdia);
367367

368368
m_mdhd = std::make_shared<Box_mdhd>();
369-
m_mdhd->set_timescale(info->track_timescale);
369+
m_mdhd->set_timescale(options->track_timescale);
370370
mdia->append_child_box(m_mdhd);
371371

372372
m_hdlr = std::make_shared<Box_hdlr>();
@@ -400,8 +400,8 @@ Track::Track(HeifContext* ctx, uint32_t track_id, TrackInfo* info, uint32_t hand
400400
m_stss = std::make_shared<Box_stss>();
401401
m_stbl->append_child_box(m_stss);
402402

403-
if (info) {
404-
m_track_info = *info;
403+
if (options) {
404+
m_track_info = *options;
405405

406406
if (m_track_info.with_tai_timestamps != heif_sample_aux_info_presence_none) {
407407
m_aux_helper_tai_timestamps = std::make_unique<SampleAuxInfoHelper>(m_track_info.write_aux_info_interleaved);
@@ -413,7 +413,7 @@ Track::Track(HeifContext* ctx, uint32_t track_id, TrackInfo* info, uint32_t hand
413413
m_aux_helper_content_ids->set_aux_info_type(fourcc("suid"));
414414
}
415415

416-
if (!info->gimi_track_content_id.empty()) {
416+
if (!options->gimi_track_content_id.empty()) {
417417
auto hdlr_box = std::make_shared<Box_hdlr>();
418418
hdlr_box->set_handler_type(fourcc("meta"));
419419

@@ -424,8 +424,8 @@ Track::Track(HeifContext* ctx, uint32_t track_id, TrackInfo* info, uint32_t hand
424424

425425
std::vector<uint8_t> track_uuid_vector;
426426
track_uuid_vector.insert(track_uuid_vector.begin(),
427-
info->gimi_track_content_id.c_str(),
428-
info->gimi_track_content_id.c_str() + info->gimi_track_content_id.length() + 1);
427+
options->gimi_track_content_id.c_str(),
428+
options->gimi_track_content_id.c_str() + options->gimi_track_content_id.length() + 1);
429429

430430
auto iloc_box = std::make_shared<Box_iloc>();
431431
iloc_box->append_data(1, track_uuid_vector, 1);

0 commit comments

Comments
 (0)