#include <ctype.h>
#include <errno.h>
+#include <fcntl.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
int FileList::open_file(int rd, int wr)
{
- int result = 0;
+ int result = 1;
// skip header for write
if(file->wr)
{
+ int fd = open(asset->path, O_CREAT+O_TRUNC+O_RDWR, 0777);
+ if( fd >= 0 ) {
+ close(fd);
+ result = 0;
// Frame files are created in write_frame and list index is created when
// file is closed.
// Look for the starting number in the path but ignore the starting character
// and total digits since these are used by the header.
- Render::get_starting_number(asset->path,
- first_number,
- number_start,
- number_digits);
- path_list.remove_all_objects();
- writer = new FrameWriter(this,
+ Render::get_starting_number(asset->path,
+ first_number, number_start, number_digits);
+ path_list.remove_all_objects();
+ writer = new FrameWriter(this,
asset->format == list_type ? file->cpus : 1);
+ }
+ else
+ eprintf(_("Error while opening \"%s\" for writing. \n%m\n"), asset->path);
}
else
if(file->rd)
//printf("FileList::open_file 2\n", asset->use_header);
//printf("FileList::open_file %d\n", __LINE__);
asset->format = frame_type;
+ int width = asset->width;
+ int height = asset->height;
result = read_frame_header(asset->path);
+ asset->actual_width = asset->width;
+ if( width ) asset->width = width;
+ asset->actual_height = asset->height;
+ if( height ) asset->height = height;
asset->layers = 1;
- if(!asset->frame_rate)
+ if( !asset->frame_rate )
asset->frame_rate = 1;
asset->video_length = -1;
}
+ result = 0;
}
+ else
+ eprintf(_("Error while opening \"%s\" for reading. \n%m\n"), asset->path);
}
else
{
Render::get_starting_number(asset->path,
- first_number,
- number_start,
- number_digits,
- 6);
+ first_number, number_start, number_digits, 6);
+ result = 0;
}
}
int FileList::write_list_header()
{
FILE *stream = fopen(asset->path, "w");
+ if( !stream ) return 1;
// Use sprintf instead of fprintf for VFS.
- char string[BCTEXTLEN];
- sprintf(string, "%s\n", list_prefix);
- fwrite(string, strlen(string), 1, stream);
- sprintf(string, "# First line is always %s\n", list_prefix);
- fwrite(string, strlen(string), 1, stream);
- sprintf(string, "# Frame rate:\n");
- fwrite(string, strlen(string), 1, stream);
- sprintf(string, "%f\n", asset->frame_rate);
- fwrite(string, strlen(string), 1, stream);
- sprintf(string, "# Width:\n");
- fwrite(string, strlen(string), 1, stream);
- sprintf(string, "%d\n", asset->width);
- fwrite(string, strlen(string), 1, stream);
- sprintf(string, "# Height:\n");
- fwrite(string, strlen(string), 1, stream);
- sprintf(string, "%d\n", asset->height);
- fwrite(string, strlen(string), 1, stream);
- sprintf(string, "# List of image files follows\n");
- fwrite(string, strlen(string), 1, stream);
-
- for(int i = 0; i < path_list.total; i++)
- {
+ fprintf(stream, "%s\n", list_prefix);
+ fprintf(stream, "# First line is always %s\n", list_prefix);
+ fprintf(stream, "# Frame rate:\n");
+ fprintf(stream, "%f\n", asset->frame_rate);
+ fprintf(stream, "# Width:\n");
+ fprintf(stream, "%d\n", asset->width);
+ fprintf(stream, "# Height:\n");
+ fprintf(stream, "%d\n", asset->height);
+ fprintf(stream, "# List of image files follows\n");
+
+ char *cp = strrchr(asset->path, '/');
+ int dir_len = !cp ? 0 : cp - asset->path;
+
+ for(int i = 0; i < path_list.total; i++) {
+ const char *path = path_list.values[i];
// Fix path for VFS but leave leading slash
- if(!strncmp(path_list.values[i], RENDERFARM_FS_PREFIX, strlen(RENDERFARM_FS_PREFIX)))
- sprintf(string, "%s\n", path_list.values[i] + strlen(RENDERFARM_FS_PREFIX));
- else
- sprintf(string, "%s\n", path_list.values[i]);
- fwrite(string, strlen(string), 1, stream);
+ if( !strncmp(path, RENDERFARM_FS_PREFIX, strlen(RENDERFARM_FS_PREFIX)) )
+ path += strlen(RENDERFARM_FS_PREFIX);
+// ./path for relative list access
+ else if( dir_len > 0 && !strncmp(path, asset->path, dir_len) ) {
+ fprintf(stream, "."); path += dir_len;
+ }
+ fprintf(stream, "%s\n", path);
}
fclose(stream);
return 0;
asset->audio_data = 0;
asset->video_data = 1;
-// Get all the paths
+ char prefix[BCTEXTLEN], *bp = prefix, *cp = strrchr(asset->path, '/');
+ for( int i=0, n=!cp ? 0 : cp-asset->path; i<n; ++i ) *bp++ = asset->path[i];
+ *bp = 0;
+
+// Get all the paths, expand relative paths
int missing = 0;
- while(!feof(stream) && fgets(string, BCTEXTLEN, stream) ) {
+ while( !feof(stream) && fgets(string, BCTEXTLEN, stream) ) {
int len = strlen(string);
- if( !len || string[0] == '#' || string[0] == ' ') continue;
- string[len-1] = 0;
- if( access(string,R_OK) && !missing++ )
- eprintf(_("%s:no such file"), string);
- path_list.append(cstrdup(string));
+ if( !len || string[0] == '#' || string[0] == ' ' ) continue;
+ if( string[len-1] == '\n' ) string[len-1] = 0;
+ char path[BCTEXTLEN], *pp = path, *ep = pp + sizeof(path)-1;
+ if( string[0] == '.' && string[1] == '/' && prefix[0] )
+ pp += snprintf(pp, ep-pp, "%s/", prefix);
+ snprintf(pp, ep-pp, "%s", string);
+ if( access(path, R_OK) && !missing++ )
+ eprintf(_("%s:no such file"), path);
+ path_list.append(cstrdup(path));
}
//for(int i = 0; i < path_list.total; i++) printf("%s\n", path_list.values[i]);
FILE *in;
-// Fix path for VFS
+// Fix path for VFS. Not used anymore.
if(!strncmp(asset->path, RENDERFARM_FS_PREFIX, strlen(RENDERFARM_FS_PREFIX)))
sprintf(string, "%s%s", RENDERFARM_FS_PREFIX, path);
else
data->allocate_compressed_data(ostat.st_size);
data->set_compressed_size(ostat.st_size);
(void)fread(data->get_data(), ostat.st_size, 1, fd);
- temp = new VFrame(0,
- -1,
- asset->width,
- asset->height,
- frame->get_color_model(),
- -1);
+ temp = new VFrame(asset->actual_width, asset->actual_height,
+ frame->get_color_model(), 0);
read_frame(temp, data);
break;
}
}
else
{
- temp = new VFrame(0,
- -1,
- asset->width,
- asset->height,
- frame->get_color_model(),
- -1);
+ temp = new VFrame(asset->actual_width, asset->actual_height,
+ frame->get_color_model(), 0);
read_frame(temp, asset->path);
}
}
if(!temp) return result;
-// printf("FileList::read_frame frame=%d temp=%d\n",
-// frame->get_color_model(),
-// temp->get_color_model());
- if(frame->get_color_model() == temp->get_color_model())
- {
- frame->copy_from(temp);
- }
- else
- {
-// Never happens
- BC_CModels::transfer(frame->get_rows(), /* Leave NULL if non existent */
- temp->get_rows(),
- frame->get_y(), /* Leave NULL if non existent */
- frame->get_u(),
- frame->get_v(),
- temp->get_y(), /* Leave NULL if non existent */
- temp->get_u(),
- temp->get_v(),
- 0, /* Dimensions to capture from input frame */
- 0,
- asset->width,
- asset->height,
- 0, /* Dimensions to project on output frame */
- 0,
- asset->width,
- asset->height,
- temp->get_color_model(),
- frame->get_color_model(),
- 0, /* When transfering BC_RGBA8888 to non-alpha this is the background color in 0xRRGGBB hex */
- temp->get_w(), /* For planar use the luma rowspan */
- frame->get_w());
- }
+//printf("FileList::read_frame frame=%d temp=%d\n",
+// frame->get_color_model(), // temp->get_color_model());
+ frame->transfer_from(temp);
}
projects / goodguy / history.git / blobdiff