claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Add array to convert paranoia_mode_cb into a string.

Browse Source
This commit is contained in:
rocky
2005-01-13 04:00:15 +00:00
parent ec58bc385f
commit 424b735b92
2 changed files with 66 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/cdio/paranoia.h
View File

@@ -1,7 +1,7 @@
/*
$Id: paranoia.h,v 1.2 2005/01/11 04:00:26 rocky Exp $
$Id: paranoia.h,v 1.3 2005/01/13 04:00:15 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1998 Monty xiphmont@mit.edu
This program is free software; you can redistribute it and/or modify
@@ -69,6 +69,8 @@ typedef enum {
PARANOIA_CB_READERR
} paranoia_cb_mode_t;
extern const char *paranoia_cb_mode2str[];
#ifdef __cplusplus
extern "C" {
#endif
@@ -103,12 +105,18 @@ extern void paranoia_modeset(cdrom_paranoia_t *p, int mode);
*/
extern lsn_t paranoia_seek(cdrom_paranoia_t *p, off_t seek, int whence);
/*! The returned buffer is *not* to be freed by the caller. It will
persist only until the next call to paranoia_read() for this p
/*! @return the audio data read CDIO_CD_FRAMESIZE_RAW bytes. This data
is not freed by the caller, but will persist only until the next
call.
*/
extern int16_t *paranoia_read(cdrom_paranoia_t *p,
void(*callback)(long int, paranoia_cb_mode_t));
/*! The same as paranoia_read but the number of retries is set.
@param maxretries number of times to try re-reading a block before
failing. @see paranoia_read.
*/
extern int16_t *paranoia_read_limited(cdrom_paranoia_t *p,
void(*callback)(long int,
paranoia_cb_mode_t),

82
lib/paranoia/paranoia.c
View File

@@ -1,5 +1,5 @@
/*
$Id: paranoia.c,v 1.5 2005/01/07 02:42:29 rocky Exp $
$Id: paranoia.c,v 1.6 2005/01/13 04:00:15 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1998 Monty xiphmont@mit.edu
@@ -84,6 +84,22 @@
#include "gap.h"
#include "isort.h"
const char *paranoia_cb_mode2str[] = {
"read",
"verify",
"fixup edge",
"fixup atom",
"scratch",
"repair",
"skip",
"drift",
"backoff",
"overlap",
"fixup dropped",
"fixup duplicated",
"read error"
};
static inline long
re(root_block *root)
{
@@ -288,22 +304,23 @@ stage1_matched(c_block_t *old, c_block_t *new,
long newadjbegin=matchbegin-matchoffset-cb(new);
long newadjend=matchend-matchoffset-cb(new);
if (matchbegin-matchoffset<=cb(new) ||
matchbegin<=cb(old) ||
(new->flags[newadjbegin]&1) ||
(old->flags[oldadjbegin]&1)) {
if(matchoffset)
if(callback)(*callback)(matchbegin,PARANOIA_CB_FIXUP_EDGE);
if ( matchbegin-matchoffset<=cb(new)
|| matchbegin<=cb(old)
|| (new->flags[newadjbegin]&1)
|| (old->flags[oldadjbegin]&1) ) {
if ( matchoffset && callback )
(*callback)(matchbegin,PARANOIA_CB_FIXUP_EDGE);
} else
if(callback)(*callback)(matchbegin,PARANOIA_CB_FIXUP_ATOM);
if (callback)
(*callback)(matchbegin,PARANOIA_CB_FIXUP_ATOM);
if(matchend-matchoffset>=ce(new) ||
if ( matchend-matchoffset>=ce(new) ||
(new->flags[newadjend]&1) ||
matchend>=ce(old) ||
(old->flags[oldadjend]&1)){
if(matchoffset)
if(callback)(*callback)(matchend,PARANOIA_CB_FIXUP_EDGE);
}else
(old->flags[oldadjend]&1) ) {
if ( matchoffset && callback )
(*callback)(matchend,PARANOIA_CB_FIXUP_EDGE);
} else
if (callback)
(*callback)(matchend, PARANOIA_CB_FIXUP_ATOM);
@@ -380,38 +397,42 @@ i_iterate_stage1(cdrom_paranoia_t *p, c_block_t *old, c_block_t *new,
}
static long int
i_stage1(cdrom_paranoia_t *p, c_block_t *new,
i_stage1(cdrom_paranoia_t *p, c_block_t *p_new,
void (*callback)(long int, paranoia_cb_mode_t))
{
long size=cs(new);
long size=cs(p_new);
c_block_t *ptr=c_last(p);
int ret=0;
long begin=0,end;
long int begin=0;
long int end;
if (ptr)
sort_setup( p->sortcache, cv(new), &cb(new), cs(new), cb(new), ce(new) );
sort_setup( p->sortcache, cv(p_new), &cb(p_new), cs(p_new), cb(p_new),
ce(p_new) );
while(ptr && ptr!=new){
if(callback)(*callback)(cb(new),PARANOIA_CB_VERIFY);
i_iterate_stage1(p,ptr,new,callback);
while( ptr && ptr != p_new ) {
if (callback)
(*callback)(cb(p_new), PARANOIA_CB_VERIFY);
i_iterate_stage1(p,ptr,p_new,callback);
ptr=c_prev(ptr);
}
/* parse the verified areas of new into v_fragments */
/* parse the verified areas of p_new into v_fragments */
begin=0;
while(begin<size){
for(;begin<size;begin++)if(new->flags[begin]&4)break;
for(end=begin;end<size;end++)if((new->flags[end]&4)==0)break;
if(begin>=size)break;
while (begin<size) {
for ( ; begin < size; begin++)
if(p_new->flags[begin]&4) break;
for (end=begin; end < size; end++)
if((p_new->flags[end]&4)==0) break;
if (begin>=size) break;
ret++;
new_v_fragment(p,new,cb(new)+max(0,begin-OVERLAP_ADJ),
cb(new)+min(size,end+OVERLAP_ADJ),
(end+OVERLAP_ADJ>=size && new->lastsector));
new_v_fragment(p,p_new,cb(p_new)+max(0,begin-OVERLAP_ADJ),
cb(p_new)+min(size,end+OVERLAP_ADJ),
(end+OVERLAP_ADJ>=size && p_new->lastsector));
begin=end;
}
@@ -446,7 +467,8 @@ i_iterate_stage2(cdrom_paranoia_t *p,
if(min(fe(v)+p->dynoverlap,re(root))-
max(fb(v)-p->dynoverlap,rb(root))<=0)return(0);
if(callback)(*callback)(fb(v),PARANOIA_CB_VERIFY);
if (callback)
(*callback)(fb(v),PARANOIA_CB_VERIFY);
/* just a bit of v; determine the correct area */
fbv=max(fb(v),rb(root)-p->dynoverlap);